@itwin/presentation-hierarchies 2.0.0-alpha.2 → 2.0.0-alpha.20

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/HideNodesInHierarchy.js

@@ -5,7 +5,7 @@
 import { concat, defer, EMPTY, filter, finalize, map, merge, mergeAll, mergeMap, take } from "rxjs";
 import { assert } from "@itwin/core-bentley";
 import { HierarchyNodeKey } from "../../HierarchyNodeKey.js";
-import { createNodeIdentifierForLogging, createOperatorLoggingNamespace, hasChildren, LOGGING_NAMESPACE_INTERNAL } from "../../internal/Common.js";
+import { createNodeIdentifierForLogging, createOperatorLoggingNamespace, hasChildren, LOGGING_NAMESPACE_INTERNAL, } from "../../internal/Common.js";
 import { doLog, log } from "../../internal/LoggingUtils.js";
 import { partition } from "../../internal/operators/Partition.js";
 import { reduceToMergeMapItem } from "../../internal/operators/ReduceToMergeMap.js";
@@ -21,12 +21,17 @@ export const LOGGING_NAMESPACE = createOperatorLoggingNamespace(OPERATOR_NAME, L
  */
 export function createHideNodesInHierarchyOperator(getNodes, stopOnFirstChild) {
     return function (nodes) {
-        const inputNodes = nodes.pipe(log({ category: LOGGING_NAMESPACE, message: /* c8 ignore next */ (n) => `in: ${createNodeIdentifierForLogging(n)}` }));
-        const [withFlag, withoutFlag] = partition(inputNodes, (n) => (ProcessedHierarchyNode.isGeneric(n) || ProcessedHierarchyNode.isInstancesNode(n)) && !!n.processingParams?.hideInHierarchy);
+        const inputNodes = nodes.pipe(
+        /* v8 ignore next -- @preserve */
+        log({ category: LOGGING_NAMESPACE, message: (n) => `in: ${createNodeIdentifierForLogging(n)}` }));
+        const [withFlag, withoutFlag] = partition(inputNodes, (n) => (ProcessedHierarchyNode.isGeneric(n) || ProcessedHierarchyNode.isInstancesNode(n)) &&
+            !!n.processingParams?.hideInHierarchy);
         // Defer to create a new seed for reduce on every subscribe
-        const withLoadedChildren = defer(() => withFlag.pipe(log({
+        const withLoadedChildren = defer(() => withFlag.pipe(
+        /* v8 ignore next -- @preserve */
+        log({
             category: LOGGING_NAMESPACE,
-            message: /* c8 ignore next */ (n) => `${createNodeIdentifierForLogging(n)} needs hide and needs children to be loaded`,
+            message: (n) => `${createNodeIdentifierForLogging(n)} needs hide and needs children to be loaded`,
         }), filter((node) => node.children !== false), reduceToMergeMapItem((node) => createMergeMapKey(node), (node, mergedNode) => {
             if (mergedNode) {
                 if (ProcessedHierarchyNode.isGeneric(mergedNode)) {
@@ -37,22 +42,33 @@ export function createHideNodesInHierarchyOperator(getNodes, stopOnFirstChild) {
                 return mergeInstanceNodes(mergedNode, node);
             }
             return node;
-        }), log({ category: LOGGING_NAMESPACE, message: /* c8 ignore next */ (mm) => `created a merge map of size ${mm.size}` }), mergeMap((mm) => [...mm.values()].map((mergedNode) => defer(() => getNodes(mergedNode)))), mergeAll(), map((n) => n)));
-        return merge(withoutFlag.pipe(log({
+        }), 
+        /* v8 ignore next -- @preserve */
+        log({ category: LOGGING_NAMESPACE, message: (mm) => `created a merge map of size ${mm.size}` }), mergeMap((mm) => [...mm.values()].map((mergedNode) => defer(() => getNodes(mergedNode)))), mergeAll(), map((n) => n)));
+        return merge(withoutFlag.pipe(
+        /* v8 ignore next -- @preserve */
+        log({
             category: LOGGING_NAMESPACE,
-            message: /* c8 ignore next */ (n) => `${createNodeIdentifierForLogging(n)} doesn't need hide, return the node`,
+            message: (n) => `${createNodeIdentifierForLogging(n)} doesn't need hide, return the node`,
         })), stopOnFirstChild
             ? concat(
             // a small hack to handle situation when we're here to only check if parent node has children and one of them has `hideIfNoChildren` flag
             // with a `hasChildren = true` - we just return the hidden node itself in that case to avoid digging deeper into the hierarchy
-            inputNodes.pipe(filter(hasChildren), log({
+            inputNodes.pipe(filter(hasChildren), 
+            /* v8 ignore next -- @preserve */
+            log({
                 category: LOGGING_NAMESPACE,
-                message: /* c8 ignore next */ (n) => `\`stopOnFirstChild = true\` and node ${createNodeIdentifierForLogging(n)} is set to always have nodes - return the hidden node without loading children`,
-            })), EMPTY.pipe(finalize(() => doLog({
-                category: LOGGING_NAMESPACE,
-                message: /* c8 ignore next */ () => `\`stopOnFirstChild = true\` but none of the nodes had children determined to \`true\` - do load children`,
-            }))), withLoadedChildren).pipe(take(1))
-            : withLoadedChildren).pipe(log({ category: LOGGING_NAMESPACE, message: /* c8 ignore next */ (n) => `out: ${createNodeIdentifierForLogging(n)}` }));
+                message: (n) => `\`stopOnFirstChild = true\` and node ${createNodeIdentifierForLogging(n)} is set to always have nodes - return the hidden node without loading children`,
+            })), EMPTY.pipe(finalize(() => {
+                /* v8 ignore next -- @preserve */
+                doLog({
+                    category: LOGGING_NAMESPACE,
+                    message: () => `\`stopOnFirstChild = true\` but none of the nodes had children determined to \`true\` - do load children`,
+                });
+            })), withLoadedChildren).pipe(take(1))
+            : withLoadedChildren).pipe(
+        /* v8 ignore next -- @preserve */
+        log({ category: LOGGING_NAMESPACE, message: (n) => `out: ${createNodeIdentifierForLogging(n)}` }));
     };
 }
 function createMergeMapKey(node) {

package/lib/hierarchies/imodel/operators/HideNodesInHierarchy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HideNodesInHierarchy.js","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/operators/HideNodesInHierarchy.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 { concat, defer, EMPTY, filter, finalize, map, merge, mergeAll, mergeMap, take } from \"rxjs\";\nimport { assert } from \"@itwin/core-bentley\";\nimport { HierarchyNodeKey } from \"../../HierarchyNodeKey.js\";\nimport {\n  createNodeIdentifierForLogging,\n  createOperatorLoggingNamespace,\n  hasChildren,\n  LOGGING_NAMESPACE_INTERNAL,\n} from \"../../internal/Common.js\";\nimport { doLog, log } from \"../../internal/LoggingUtils.js\";\nimport { partition } from \"../../internal/operators/Partition.js\";\nimport { reduceToMergeMapItem } from \"../../internal/operators/ReduceToMergeMap.js\";\nimport { ProcessedHierarchyNode } from \"../IModelHierarchyNode.js\";\nimport { mergeInstanceNodes } from \"../Utils.js\";\n\nimport type { Observable } from \"rxjs\";\nimport type { GenericNodeKey, InstancesNodeKey } from \"../../HierarchyNodeKey.js\";\nimport type { ProcessedGenericHierarchyNode, ProcessedInstanceHierarchyNode } from \"../IModelHierarchyNode.js\";\n\nconst OPERATOR_NAME = \"HideNodesInHierarchy\";\n/** @internal */\nexport const LOGGING_NAMESPACE = createOperatorLoggingNamespace(OPERATOR_NAME, LOGGING_NAMESPACE_INTERNAL);\n\n/**\n * Creates an operator that hides nodes and instead returns their children if the nodes have a `hideInHierarchy` handling param.\n *\n * @internal\n */\nexport function createHideNodesInHierarchyOperator(\n  getNodes: (parentNode: ProcessedHierarchyNode) => Observable<ProcessedHierarchyNode>,\n  stopOnFirstChild: boolean,\n) {\n  return function (nodes: Observable<ProcessedHierarchyNode>): Observable<ProcessedHierarchyNode> {\n    const inputNodes = nodes.pipe(\n      /* v8 ignore next -- @preserve */\n      log({ category: LOGGING_NAMESPACE, message: (n) => `in: ${createNodeIdentifierForLogging(n)}` }),\n    );\n    const [withFlag, withoutFlag] = partition(\n      inputNodes,\n      (n): n is ProcessedGenericHierarchyNode | ProcessedInstanceHierarchyNode =>\n        (ProcessedHierarchyNode.isGeneric(n) || ProcessedHierarchyNode.isInstancesNode(n)) &&\n        !!n.processingParams?.hideInHierarchy,\n    );\n    // Defer to create a new seed for reduce on every subscribe\n    const withLoadedChildren = defer(() =>\n      withFlag.pipe(\n        /* v8 ignore next -- @preserve */\n        log({\n          category: LOGGING_NAMESPACE,\n          message: (n) => `${createNodeIdentifierForLogging(n)} needs hide and needs children to be loaded`,\n        }),\n        filter((node) => node.children !== false),\n        reduceToMergeMapItem(\n          (node) => createMergeMapKey(node),\n          (node, mergedNode: ProcessedGenericHierarchyNode | ProcessedInstanceHierarchyNode | undefined) => {\n            if (mergedNode) {\n              if (ProcessedHierarchyNode.isGeneric(mergedNode)) {\n                // we don't merge generic nodes, just return the first one\n                return mergedNode;\n              }\n              assert(ProcessedHierarchyNode.isInstancesNode(node));\n              return mergeInstanceNodes(mergedNode, node);\n            }\n            return node;\n          },\n        ),\n        /* v8 ignore next -- @preserve */\n        log({ category: LOGGING_NAMESPACE, message: (mm) => `created a merge map of size ${mm.size}` }),\n        mergeMap((mm) => [...mm.values()].map((mergedNode) => defer(() => getNodes(mergedNode)))),\n        mergeAll(),\n        map((n): ProcessedHierarchyNode => n),\n      ),\n    );\n\n    return merge(\n      withoutFlag.pipe(\n        /* v8 ignore next -- @preserve */\n        log({\n          category: LOGGING_NAMESPACE,\n          message: (n) => `${createNodeIdentifierForLogging(n)} doesn't need hide, return the node`,\n        }),\n      ),\n      stopOnFirstChild\n        ? concat(\n            // a small hack to handle situation when we're here to only check if parent node has children and one of them has `hideIfNoChildren` flag\n            // with a `hasChildren = true` - we just return the hidden node itself in that case to avoid digging deeper into the hierarchy\n            inputNodes.pipe(\n              filter(hasChildren),\n              /* v8 ignore next -- @preserve */\n              log({\n                category: LOGGING_NAMESPACE,\n                message: (n) =>\n                  `\\`stopOnFirstChild = true\\` and node ${createNodeIdentifierForLogging(n)} is set to always have nodes - return the hidden node without loading children`,\n              }),\n            ),\n            EMPTY.pipe(\n              finalize(() => {\n                /* v8 ignore next -- @preserve */\n                doLog({\n                  category: LOGGING_NAMESPACE,\n                  message: () =>\n                    `\\`stopOnFirstChild = true\\` but none of the nodes had children determined to \\`true\\` - do load children`,\n                });\n              }),\n            ),\n            withLoadedChildren,\n          ).pipe(take(1))\n        : withLoadedChildren,\n    ).pipe(\n      /* v8 ignore next -- @preserve */\n      log({ category: LOGGING_NAMESPACE, message: (n) => `out: ${createNodeIdentifierForLogging(n)}` }),\n    );\n  };\n}\n\nfunction createMergeMapKey<TNode extends { key: InstancesNodeKey | GenericNodeKey }>(node: TNode): string {\n  if (HierarchyNodeKey.isGeneric(node.key)) {\n    return `${node.key.source ? `${node.key.source}:` : \"\"}${node.key.id}`;\n  }\n  return node.key.instanceKeys[0].className;\n}\n"]}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/AutoExpand.d.ts

@@ -1,4 +1,4 @@
-import { GroupingHandlerResult } from "../Grouping.js";
+import type { GroupingHandlerResult } from "../Grouping.js";
 /** @internal */
 export declare function assignAutoExpand(props: GroupingHandlerResult): GroupingHandlerResult;
 //# sourceMappingURL=AutoExpand.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/AutoExpand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AutoExpand.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/AutoExpand.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE5D,gBAAgB;AAChB,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,qBAAqB,CAepF"}

package/lib/hierarchies/imodel/operators/grouping/AutoExpand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AutoExpand.js","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/AutoExpand.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAK7D,gBAAgB;AAChB,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC3D,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,cAAuD,CAAC;QAC5D,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,aAAa,EAAE,EAAE;YACzE,IAAI,cAAc,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,cAAc,GAAG,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC;YACvF,OAAO;QACT,CAAC,CAAC,CAAC;QACH,IAAI,cAAc,KAAK,QAAQ,IAAI,CAAC,cAAc,KAAK,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YACrG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC","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 { iterateChildNodeGroupingParams } from \"./Shared.js\";\n\nimport type { HierarchyNodeAutoExpandProp } from \"../../IModelHierarchyNode.js\";\nimport type { GroupingHandlerResult } from \"../Grouping.js\";\n\n/** @internal */\nexport function assignAutoExpand(props: GroupingHandlerResult): GroupingHandlerResult {\n  for (const node of props.grouped) {\n    let autoExpandProp: HierarchyNodeAutoExpandProp | undefined;\n    iterateChildNodeGroupingParams(node, props.groupingType, (groupingProps) => {\n      if (autoExpandProp === \"always\") {\n        return true;\n      }\n      autoExpandProp = groupingProps?.autoExpand ? groupingProps.autoExpand : autoExpandProp;\n      return;\n    });\n    if (autoExpandProp === \"always\" || (autoExpandProp === \"single-child\" && node.children.length === 1)) {\n      node.autoExpand = true;\n    }\n  }\n  return props;\n}\n"]}

package/lib/hierarchies/imodel/operators/grouping/BaseClassGrouping.d.ts

@@ -0,0 +1,11 @@
+import type { EC, ECSchemaProvider } from "@itwin/presentation-shared";
+import type { ParentHierarchyNode } from "../../../HierarchyNode.js";
+import type { ProcessedInstanceHierarchyNode } from "../../IModelHierarchyNode.js";
+import type { GroupingHandler, GroupingHandlerResult } from "../Grouping.js";
+/** @internal */
+export declare function getBaseClassGroupingECClasses(schemaProvider: ECSchemaProvider, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[]): Promise<EC.Class[]>;
+/** @internal */
+export declare function createBaseClassGroupsForSingleBaseClass(nodes: ProcessedInstanceHierarchyNode[], baseECClass: EC.Class, classHierarchyInspector: Pick<ECSchemaProvider, "classDerivesFrom">): Promise<GroupingHandlerResult>;
+/** @internal */
+export declare function createBaseClassGroupingHandlers(imodelAccess: ECSchemaProvider, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[]): Promise<GroupingHandler[]>;
+//# sourceMappingURL=BaseClassGrouping.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/BaseClassGrouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseClassGrouping.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/BaseClassGrouping.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAE7E,gBAAgB;AAChB,wBAAsB,6BAA6B,CACjD,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,mBAAmB,GAAG,SAAS,EAC3C,KAAK,EAAE,8BAA8B,EAAE,GACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CA2BrB;AAED,gBAAgB;AAChB,wBAAsB,uCAAuC,CAC3D,KAAK,EAAE,8BAA8B,EAAE,EACvC,WAAW,EAAE,EAAE,CAAC,KAAK,EACrB,uBAAuB,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,GAClE,OAAO,CAAC,qBAAqB,CAAC,CA0ChC;AAsCD,gBAAgB;AAChB,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,mBAAmB,GAAG,SAAS,EAC3C,KAAK,EAAE,8BAA8B,EAAE,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC,CAK5B"}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/BaseClassGrouping.js

@@ -8,7 +8,7 @@ import { HierarchyNode } from "../../../HierarchyNode.js";
 export async function getBaseClassGroupingECClasses(schemaProvider, parentNode, nodes) {
     // Get all base class names that are provided in the grouping information
     const baseClassesFullClassNames = await getGroupingBaseClassNames(nodes);
-    if (baseClassesFullClassNames.size === 0) {
+    if (baseClassesFullClassNames.length === 0) {
         return [];
     }
     const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();
@@ -17,7 +17,7 @@ export async function getBaseClassGroupingECClasses(schemaProvider, parentNode,
         await releaseMainThread();
         baseClasses.push(await getClass(schemaProvider, fullName));
     }
-    const sortedClasses = await sortByBaseClass(baseClasses.filter((baseClass) => baseClass.isRelationshipClass() || baseClass.isEntityClass()));
+    const sortedClasses = sortByBaseClass(baseClasses.filter((baseClass) => baseClass.isRelationshipClass() || baseClass.isEntityClass()));
     if (parentNode && HierarchyNode.isClassGroupingNode(parentNode)) {
         // if we have a class grouping node, we can cut the front of sortedClasses up to a point where our grouping class is
         const cutPosition = sortedClasses.findIndex((c) => c.fullName === parentNode.key.className);
@@ -37,14 +37,15 @@ export async function createBaseClassGroupsForSingleBaseClass(nodes, baseECClass
     for (const node of nodes) {
         await releaseMainThread();
         if (!node.processingParams?.grouping?.byBaseClasses ||
-            !node.processingParams.grouping.byBaseClasses.fullClassNames.some((className) => className === baseClassFullName)) {
+            !node.processingParams.grouping.byBaseClasses.fullClassNames.includes(baseClassFullName)) {
             ungroupedNodes.push(node);
             continue;
         }
         const fullCurrentNodeClassName = node.key.instanceKeys[0].className;
         const baseCheckerResult = classHierarchyInspector.classDerivesFrom(fullCurrentNodeClassName, baseClassFullName);
-        /* c8 ignore next */
-        const isCurrentNodeClassOfBase = baseCheckerResult instanceof Promise ? await baseCheckerResult : baseCheckerResult;
+        const isCurrentNodeClassOfBase = baseCheckerResult instanceof Promise
+            ? await baseCheckerResult
+            : /* v8 ignore next -- @preserve */ baseCheckerResult;
         if (isCurrentNodeClassOfBase) {
             groupedNodes.push(node);
         }
@@ -54,10 +55,7 @@ export async function createBaseClassGroupsForSingleBaseClass(nodes, baseECClass
     }
     const result = { grouped: [], ungrouped: ungroupedNodes, groupingType: "base-class" };
     if (groupedNodes.length > 0) {
-        const groupingNodeKey = {
-            type: "class-grouping",
-            className: baseClassFullName,
-        };
+        const groupingNodeKey = { type: "class-grouping", className: baseClassFullName };
         result.grouped.push({
             label: baseECClass.label ?? baseECClass.name,
             key: groupingNodeKey,
@@ -79,9 +77,9 @@ async function getGroupingBaseClassNames(nodes) {
             }
         }
     }
-    return baseClasses;
+    return [...baseClasses];
 }
-async function sortByBaseClass(classes) {
+function sortByBaseClass(classes) {
     if (classes.length === 0) {
         return classes;
     }
@@ -89,7 +87,7 @@ async function sortByBaseClass(classes) {
     for (let inputIndex = 1; inputIndex < classes.length; ++inputIndex) {
         let wasAdded = false;
         for (let outputIndex = output.length - 1; outputIndex >= 0; --outputIndex) {
-            if (await classes[inputIndex].is(output[outputIndex])) {
+            if (classes[inputIndex].is(output[outputIndex])) {
                 output.splice(outputIndex + 1, 0, classes[inputIndex]);
                 wasAdded = true;
                 break;

package/lib/hierarchies/imodel/operators/grouping/BaseClassGrouping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseClassGrouping.js","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/BaseClassGrouping.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 { createMainThreadReleaseOnTimePassedHandler, getClass } from \"@itwin/presentation-shared\";\nimport { HierarchyNode } from \"../../../HierarchyNode.js\";\n\nimport type { EC, ECSchemaProvider } from \"@itwin/presentation-shared\";\nimport type { ParentHierarchyNode } from \"../../../HierarchyNode.js\";\nimport type { ClassGroupingNodeKey } from \"../../../HierarchyNodeKey.js\";\nimport type { ProcessedInstanceHierarchyNode } from \"../../IModelHierarchyNode.js\";\nimport type { GroupingHandler, GroupingHandlerResult } from \"../Grouping.js\";\n\n/** @internal */\nexport async function getBaseClassGroupingECClasses(\n  schemaProvider: ECSchemaProvider,\n  parentNode: ParentHierarchyNode | undefined,\n  nodes: ProcessedInstanceHierarchyNode[],\n): Promise<EC.Class[]> {\n  // Get all base class names that are provided in the grouping information\n  const baseClassesFullClassNames = await getGroupingBaseClassNames(nodes);\n  if (baseClassesFullClassNames.length === 0) {\n    return [];\n  }\n\n  const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();\n  const baseClasses = [];\n  for (const fullName of baseClassesFullClassNames) {\n    await releaseMainThread();\n    baseClasses.push(await getClass(schemaProvider, fullName));\n  }\n  const sortedClasses = sortByBaseClass(\n    baseClasses.filter((baseClass) => baseClass.isRelationshipClass() || baseClass.isEntityClass()),\n  );\n\n  if (parentNode && HierarchyNode.isClassGroupingNode(parentNode)) {\n    // if we have a class grouping node, we can cut the front of sortedClasses up to a point where our grouping class is\n    const cutPosition = sortedClasses.findIndex((c) => c.fullName === parentNode.key.className);\n    if (cutPosition >= 0) {\n      return sortedClasses.slice(cutPosition + 1);\n    }\n    return [];\n  }\n\n  return sortedClasses;\n}\n\n/** @internal */\nexport async function createBaseClassGroupsForSingleBaseClass(\n  nodes: ProcessedInstanceHierarchyNode[],\n  baseECClass: EC.Class,\n  classHierarchyInspector: Pick<ECSchemaProvider, \"classDerivesFrom\">,\n): Promise<GroupingHandlerResult> {\n  const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();\n  const groupedNodes = new Array<ProcessedInstanceHierarchyNode>();\n  const ungroupedNodes = new Array<ProcessedInstanceHierarchyNode>();\n  const baseClassFullName = baseECClass.fullName;\n  for (const node of nodes) {\n    await releaseMainThread();\n    if (\n      !node.processingParams?.grouping?.byBaseClasses ||\n      !node.processingParams.grouping.byBaseClasses.fullClassNames.includes(baseClassFullName)\n    ) {\n      ungroupedNodes.push(node);\n      continue;\n    }\n    const fullCurrentNodeClassName = node.key.instanceKeys[0].className;\n\n    const baseCheckerResult = classHierarchyInspector.classDerivesFrom(fullCurrentNodeClassName, baseClassFullName);\n\n    const isCurrentNodeClassOfBase =\n      baseCheckerResult instanceof Promise\n        ? await baseCheckerResult\n        : /* v8 ignore next -- @preserve */ baseCheckerResult;\n\n    if (isCurrentNodeClassOfBase) {\n      groupedNodes.push(node);\n    } else {\n      ungroupedNodes.push(node);\n    }\n  }\n\n  const result: GroupingHandlerResult = { grouped: [], ungrouped: ungroupedNodes, groupingType: \"base-class\" };\n  if (groupedNodes.length > 0) {\n    const groupingNodeKey: ClassGroupingNodeKey = { type: \"class-grouping\", className: baseClassFullName };\n    result.grouped.push({\n      label: baseECClass.label ?? baseECClass.name,\n      key: groupingNodeKey,\n      parentKeys: [...groupedNodes[0].parentKeys],\n      groupedInstanceKeys: groupedNodes.flatMap((groupedInstanceNode) => groupedInstanceNode.key.instanceKeys),\n      children: groupedNodes.map((gn) => Object.assign(gn, { parentKeys: [...gn.parentKeys, groupingNodeKey] })),\n    });\n  }\n  return result;\n}\n\nasync function getGroupingBaseClassNames(nodes: ProcessedInstanceHierarchyNode[]) {\n  const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();\n  const baseClasses = new Set<EC.FullClassNameDotNotation>();\n  for (const node of nodes) {\n    await releaseMainThread();\n    if (node.processingParams?.grouping?.byBaseClasses) {\n      for (const className of node.processingParams.grouping.byBaseClasses.fullClassNames) {\n        baseClasses.add(className);\n      }\n    }\n  }\n  return [...baseClasses];\n}\n\nfunction sortByBaseClass(classes: EC.Class[]): EC.Class[] {\n  if (classes.length === 0) {\n    return classes;\n  }\n  const output: EC.Class[] = [classes[0]];\n  for (let inputIndex = 1; inputIndex < classes.length; ++inputIndex) {\n    let wasAdded = false;\n    for (let outputIndex = output.length - 1; outputIndex >= 0; --outputIndex) {\n      if (classes[inputIndex].is(output[outputIndex])) {\n        output.splice(outputIndex + 1, 0, classes[inputIndex]);\n        wasAdded = true;\n        break;\n      }\n    }\n    if (!wasAdded) {\n      output.splice(0, 0, classes[inputIndex]);\n    }\n  }\n\n  return output;\n}\n\n/** @internal */\nexport async function createBaseClassGroupingHandlers(\n  imodelAccess: ECSchemaProvider,\n  parentNode: ParentHierarchyNode | undefined,\n  nodes: ProcessedInstanceHierarchyNode[],\n): Promise<GroupingHandler[]> {\n  const baseClassGroupingECClasses = await getBaseClassGroupingECClasses(imodelAccess, parentNode, nodes);\n  return baseClassGroupingECClasses.map(\n    (baseECClass) => async (allNodes) => createBaseClassGroupsForSingleBaseClass(allNodes, baseECClass, imodelAccess),\n  );\n}\n"]}

package/lib/hierarchies/imodel/operators/grouping/ClassGrouping.d.ts

@@ -0,0 +1,7 @@
+import type { ECSchemaProvider } from "@itwin/presentation-shared";
+import type { ParentHierarchyNode } from "../../../HierarchyNode.js";
+import type { ProcessedInstanceHierarchyNode } from "../../IModelHierarchyNode.js";
+import type { GroupingHandlerResult } from "../Grouping.js";
+/** @internal */
+export declare function createClassGroups(schemaProvider: ECSchemaProvider, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[]): Promise<GroupingHandlerResult>;
+//# sourceMappingURL=ClassGrouping.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/ClassGrouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClassGrouping.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/ClassGrouping.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAM,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAA2C,MAAM,gBAAgB,CAAC;AAarG,gBAAgB;AAChB,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,mBAAmB,GAAG,SAAS,EAC3C,KAAK,EAAE,8BAA8B,EAAE,GACtC,OAAO,CAAC,qBAAqB,CAAC,CA2BhC"}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/ClassGrouping.js

@@ -7,19 +7,19 @@ import { HierarchyNode } from "../../../HierarchyNode.js";
 /** @internal */
 export async function createClassGroups(schemaProvider, parentNode, nodes) {
     const parentNodeClass = parentNode && HierarchyNode.isClassGroupingNode(parentNode) ? parentNode.key.className : undefined;
-    const groupings = { ungrouped: [], grouped: new Map() };
+    const groupings = {
+        ungrouped: [],
+        grouped: new Map(),
+    };
     const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();
     for (const node of nodes) {
         await releaseMainThread();
         const nodeClassName = node.key.instanceKeys[0].className;
-        if (node.processingParams?.grouping?.byClass && nodeClassName !== parentNodeClass) {
+        if (node.processingParams?.grouping?.byClass && (!parentNodeClass || nodeClassName !== parentNodeClass)) {
             let groupingInfo = groupings.grouped.get(nodeClassName);
             if (!groupingInfo) {
                 const nodeClass = await getClass(schemaProvider, nodeClassName);
-                groupingInfo = {
-                    class: nodeClass,
-                    groupedNodes: [],
-                };
+                groupingInfo = { class: nodeClass, groupedNodes: [] };
                 groupings.grouped.set(nodeClassName, groupingInfo);
             }
             groupingInfo.groupedNodes.push(node);
@@ -32,12 +32,9 @@ export async function createClassGroups(schemaProvider, parentNode, nodes) {
 async function createGroupingNodes(groupings) {
     const groupedNodes = new Array();
     const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();
-    for (const [, entry] of groupings.grouped) {
+    for (const entry of groupings.grouped.values()) {
         await releaseMainThread();
-        const groupingNodeKey = {
-            type: "class-grouping",
-            className: entry.class.fullName,
-        };
+        const groupingNodeKey = { type: "class-grouping", className: entry.class.fullName };
         const groupedNodeParentKeys = entry.groupedNodes[0].parentKeys;
         groupedNodes.push({
             label: entry.class.label ?? entry.class.name,

package/lib/hierarchies/imodel/operators/grouping/ClassGrouping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClassGrouping.js","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/ClassGrouping.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 { createMainThreadReleaseOnTimePassedHandler, getClass } from \"@itwin/presentation-shared\";\nimport { HierarchyNode } from \"../../../HierarchyNode.js\";\n\nimport type { EC, ECSchemaProvider } from \"@itwin/presentation-shared\";\nimport type { ParentHierarchyNode } from \"../../../HierarchyNode.js\";\nimport type { ClassGroupingNodeKey } from \"../../../HierarchyNodeKey.js\";\nimport type { ProcessedInstanceHierarchyNode } from \"../../IModelHierarchyNode.js\";\nimport type { GroupingHandlerResult, ProcessedInstancesGroupingHierarchyNode } from \"../Grouping.js\";\n\ninterface ClassInfo {\n  fullName: EC.FullClassNameDotNotation;\n  name: string;\n  label?: string;\n}\n\ninterface ClassGroupingInformation {\n  ungrouped: ProcessedInstanceHierarchyNode[];\n  grouped: Map<EC.FullClassNameDotNotation, { class: ClassInfo; groupedNodes: ProcessedInstanceHierarchyNode[] }>;\n}\n\n/** @internal */\nexport async function createClassGroups(\n  schemaProvider: ECSchemaProvider,\n  parentNode: ParentHierarchyNode | undefined,\n  nodes: ProcessedInstanceHierarchyNode[],\n): Promise<GroupingHandlerResult> {\n  const parentNodeClass =\n    parentNode && HierarchyNode.isClassGroupingNode(parentNode) ? parentNode.key.className : undefined;\n  const groupings: ClassGroupingInformation = {\n    ungrouped: [],\n    grouped: new Map<\n      EC.FullClassNameDotNotation,\n      { class: ClassInfo; groupedNodes: ProcessedInstanceHierarchyNode[] }\n    >(),\n  };\n  const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();\n  for (const node of nodes) {\n    await releaseMainThread();\n    const nodeClassName = node.key.instanceKeys[0].className;\n    if (node.processingParams?.grouping?.byClass && (!parentNodeClass || nodeClassName !== parentNodeClass)) {\n      let groupingInfo = groupings.grouped.get(nodeClassName);\n      if (!groupingInfo) {\n        const nodeClass = await getClass(schemaProvider, nodeClassName);\n        groupingInfo = { class: nodeClass, groupedNodes: [] };\n        groupings.grouped.set(nodeClassName, groupingInfo);\n      }\n      groupingInfo.groupedNodes.push(node);\n      continue;\n    }\n    groupings.ungrouped.push(node);\n  }\n  return createGroupingNodes(groupings);\n}\n\nasync function createGroupingNodes(groupings: ClassGroupingInformation): Promise<GroupingHandlerResult> {\n  const groupedNodes = new Array<ProcessedInstancesGroupingHierarchyNode>();\n  const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();\n  for (const entry of groupings.grouped.values()) {\n    await releaseMainThread();\n    const groupingNodeKey: ClassGroupingNodeKey = { type: \"class-grouping\", className: entry.class.fullName };\n    const groupedNodeParentKeys = entry.groupedNodes[0].parentKeys;\n    groupedNodes.push({\n      label: entry.class.label ?? entry.class.name,\n      key: groupingNodeKey,\n      parentKeys: groupedNodeParentKeys,\n      groupedInstanceKeys: entry.groupedNodes.flatMap((groupedInstanceNode) => groupedInstanceNode.key.instanceKeys),\n      children: entry.groupedNodes.map((gn) =>\n        Object.assign(gn, { parentKeys: [...groupedNodeParentKeys, groupingNodeKey] }),\n      ),\n    });\n  }\n  return { grouped: groupedNodes, ungrouped: groupings.ungrouped, groupingType: \"class\" };\n}\n"]}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/GroupHiding.d.ts

@@ -1,4 +1,4 @@
-import { GroupingHandlerResult } from "../Grouping.js";
+import type { GroupingHandlerResult } from "../Grouping.js";
 /** @internal */
 export declare function applyGroupHidingParams(props: GroupingHandlerResult, extraSiblings: number): GroupingHandlerResult;
 //# sourceMappingURL=GroupHiding.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/GroupHiding.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupHiding.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/GroupHiding.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAyD,MAAM,gBAAgB,CAAC;AAEnH,gBAAgB;AAChB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,GAAG,qBAAqB,CA2BjH"}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/GroupHiding.js

@@ -28,11 +28,7 @@ export function applyGroupHidingParams(props, extraSiblings) {
         }
         filteredGrouped.push(node);
     }
-    return {
-        groupingType,
-        grouped: filteredGrouped,
-        ungrouped,
-    };
+    return { groupingType, grouped: filteredGrouped, ungrouped };
 }
 function getHideOptionsFromNodeProcessingParams(groupingNode, groupingType) {
     let hideIfNoSiblings = false;

package/lib/hierarchies/imodel/operators/grouping/GroupHiding.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupHiding.js","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/GroupHiding.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAI7D,gBAAgB;AAChB,MAAM,UAAU,sBAAsB,CAAC,KAA4B,EAAE,aAAqB;IACxF,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACnD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,gCAAgC;IAChC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,UAAU,GAAG,sCAAsC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QACpF,IAAI,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAChC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvE,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,MAAM,eAAe,GAAG,IAAI,KAAK,EAA2C,CAAC;IAC7E,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,sCAAsC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YAC9E,IAAI,UAAU,CAAC,oBAAoB,EAAE,CAAC;gBACpC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,SAAS;YACX,CAAC;QACH,CAAC;QACD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,sCAAsC,CAC7C,YAAqD,EACrD,YAA0B;IAE1B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,8BAA8B,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,aAAa,EAAE,EAAE;QAC3E,IAAI,gBAAgB,IAAI,oBAAoB,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,gBAAgB,KAAK,CAAC,CAAC,aAAa,EAAE,gBAAgB,CAAC;QACvD,oBAAoB,KAAK,CAAC,CAAC,aAAa,EAAE,oBAAoB,CAAC;QAC/D,OAAO;IACT,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;AACpD,CAAC","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 { iterateChildNodeGroupingParams } from \"./Shared.js\";\n\nimport type { GroupingHandlerResult, GroupingType, ProcessedInstancesGroupingHierarchyNode } from \"../Grouping.js\";\n\n/** @internal */\nexport function applyGroupHidingParams(props: GroupingHandlerResult, extraSiblings: number): GroupingHandlerResult {\n  const { grouped, ungrouped, groupingType } = props;\n  if (grouped.length === 0) {\n    return props;\n  }\n\n  // handle the \"no siblings\" case\n  if (grouped.length === 1 && ungrouped.length === 0 && extraSiblings === 0) {\n    const hideParams = getHideOptionsFromNodeProcessingParams(grouped[0], groupingType);\n    if (hideParams.hideIfNoSiblings) {\n      return { groupingType, grouped: [], ungrouped: grouped[0].children };\n    }\n  }\n\n  // handle the \"no children\" case\n  const filteredGrouped = new Array<ProcessedInstancesGroupingHierarchyNode>();\n  for (const node of grouped) {\n    if (node.children.length === 1) {\n      const hideParams = getHideOptionsFromNodeProcessingParams(node, groupingType);\n      if (hideParams.hideIfOneGroupedNode) {\n        ungrouped.push(node.children[0]);\n        continue;\n      }\n    }\n    filteredGrouped.push(node);\n  }\n  return { groupingType, grouped: filteredGrouped, ungrouped };\n}\n\nfunction getHideOptionsFromNodeProcessingParams(\n  groupingNode: ProcessedInstancesGroupingHierarchyNode,\n  groupingType: GroupingType,\n): { hideIfNoSiblings: boolean; hideIfOneGroupedNode: boolean } {\n  let hideIfNoSiblings = false;\n  let hideIfOneGroupedNode = false;\n  iterateChildNodeGroupingParams(groupingNode, groupingType, (groupingProps) => {\n    if (hideIfNoSiblings && hideIfOneGroupedNode) {\n      return true;\n    }\n    hideIfNoSiblings ||= !!groupingProps?.hideIfNoSiblings;\n    hideIfOneGroupedNode ||= !!groupingProps?.hideIfOneGroupedNode;\n    return;\n  });\n  return { hideIfNoSiblings, hideIfOneGroupedNode };\n}\n"]}

package/lib/hierarchies/imodel/operators/grouping/LabelGrouping.d.ts

@@ -0,0 +1,5 @@
+import type { ProcessedInstanceHierarchyNode } from "../../IModelHierarchyNode.js";
+import type { GroupingHandlerResult } from "../Grouping.js";
+/** @internal */
+export declare function createLabelGroups(nodes: ProcessedInstanceHierarchyNode[]): Promise<GroupingHandlerResult>;
+//# sourceMappingURL=LabelGrouping.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/LabelGrouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LabelGrouping.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/LabelGrouping.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAA2C,MAAM,gBAAgB,CAAC;AAErG,gBAAgB;AAChB,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,8BAA8B,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA4C/G"}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/LabelGrouping.js

@@ -34,11 +34,7 @@ export async function createLabelGroups(nodes) {
     nodesToGroupMap.forEach((entry) => {
         const byLabel = entry[0].processingParams?.grouping?.byLabel;
         const groupId = typeof byLabel === "object" ? byLabel.groupId : undefined;
-        const groupingNodeKey = {
-            type: "label-grouping",
-            label: entry[0].label,
-            groupId,
-        };
+        const groupingNodeKey = { type: "label-grouping", label: entry[0].label, groupId };
         const groupedNodeParentKeys = entry[0].parentKeys;
         groupedNodes.push({
             label: entry[0].label,
@@ -48,10 +44,6 @@ export async function createLabelGroups(nodes) {
             children: entry.map((gn) => Object.assign(gn, { parentKeys: [...groupedNodeParentKeys, groupingNodeKey] })),
         });
     });
-    return {
-        groupingType: "label",
-        grouped: groupedNodes,
-        ungrouped,
-    };
+    return { groupingType: "label", grouped: groupedNodes, ungrouped };
 }
 //# sourceMappingURL=LabelGrouping.js.map

package/lib/hierarchies/imodel/operators/grouping/LabelGrouping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LabelGrouping.js","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/LabelGrouping.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 { mergeInstanceNodes } from \"../../Utils.js\";\n\nimport type { LabelGroupingNodeKey } from \"../../../HierarchyNodeKey.js\";\nimport type { ProcessedInstanceHierarchyNode } from \"../../IModelHierarchyNode.js\";\nimport type { GroupingHandlerResult, ProcessedInstancesGroupingHierarchyNode } from \"../Grouping.js\";\n\n/** @internal */\nexport async function createLabelGroups(nodes: ProcessedInstanceHierarchyNode[]): Promise<GroupingHandlerResult> {\n  const ungrouped = new Array<ProcessedInstanceHierarchyNode>();\n  const nodesToMergeMap = new Map<string, ProcessedInstanceHierarchyNode[]>();\n  const nodesToGroupMap = new Map<string, ProcessedInstanceHierarchyNode[]>();\n  for (const node of nodes) {\n    const byLabel = node.processingParams?.grouping?.byLabel;\n    if (!byLabel) {\n      ungrouped.push(node);\n      continue;\n    }\n    const nodeMapKeyIdentifier = `label:\"${node.label}\";groupId:${JSON.stringify(typeof byLabel === \"object\" ? byLabel.groupId : undefined)}`;\n    const map = typeof byLabel === \"object\" && byLabel.action === \"merge\" ? nodesToMergeMap : nodesToGroupMap;\n    let list = map.get(nodeMapKeyIdentifier);\n    if (!list) {\n      list = [];\n      map.set(nodeMapKeyIdentifier, list);\n    }\n    list.push(node);\n  }\n\n  nodesToMergeMap.forEach((entry) => {\n    let finalNode = entry[0];\n    for (let i = 1; i < entry.length; ++i) {\n      finalNode = mergeInstanceNodes(finalNode, entry[i]);\n    }\n    ungrouped.push(finalNode);\n  });\n\n  const groupedNodes = new Array<ProcessedInstancesGroupingHierarchyNode>();\n  nodesToGroupMap.forEach((entry) => {\n    const byLabel = entry[0].processingParams?.grouping?.byLabel;\n    const groupId = typeof byLabel === \"object\" ? byLabel.groupId : undefined;\n    const groupingNodeKey: LabelGroupingNodeKey = { type: \"label-grouping\", label: entry[0].label, groupId };\n    const groupedNodeParentKeys = entry[0].parentKeys;\n    groupedNodes.push({\n      label: entry[0].label,\n      key: groupingNodeKey,\n      parentKeys: groupedNodeParentKeys,\n      groupedInstanceKeys: entry.flatMap((groupedInstanceNode) => groupedInstanceNode.key.instanceKeys),\n      children: entry.map((gn) => Object.assign(gn, { parentKeys: [...groupedNodeParentKeys, groupingNodeKey] })),\n    });\n  });\n\n  return { groupingType: \"label\", grouped: groupedNodes, ungrouped };\n}\n"]}

package/lib/{cjs/hierarchies → hierarchies}/imodel/operators/grouping/PropertiesGrouping.d.ts

@@ -1,7 +1,7 @@
-import { EC, ECClassHierarchyInspector, ECSchemaProvider, IPrimitiveValueFormatter } from "@itwin/presentation-shared";
-import { ParentHierarchyNode } from "../../../HierarchyNode.js";
-import { HierarchyNodePropertiesGroupingParams, HierarchyNodePropertyGroup, HierarchyNodePropertyValueRange, ProcessedInstanceHierarchyNode } from "../../IModelHierarchyNode.js";
-import { GroupingHandler, GroupingHandlerResult, ProcessedInstancesGroupingHierarchyNode } from "../Grouping.js";
+import type { EC, ECSchemaProvider, IPrimitiveValueFormatter } from "@itwin/presentation-shared";
+import type { ParentHierarchyNode } from "../../../HierarchyNode.js";
+import type { HierarchyNodePropertiesGroupingParams, HierarchyNodePropertyGroup, HierarchyNodePropertyValueRange, ProcessedInstanceHierarchyNode } from "../../IModelHierarchyNode.js";
+import type { GroupingHandler, GroupingHandlerResult, ProcessedInstancesGroupingHierarchyNode } from "../Grouping.js";
 /** @internal */
 export interface PropertiesGroupingLocalizedStrings {
     other: string;
@@ -15,12 +15,12 @@ export interface PropertyGroupInfo {
 }
 /** @internal */
 export type PreviousPropertiesGroupingInfo = Array<{
-    propertiesClassName: string;
+    propertiesClassName: EC.FullClassNameDotNotation;
     propertyName: string;
     isRange?: boolean;
 }>;
 /** @internal */
-export declare function createPropertyGroups(nodesToGroup: ProcessedInstanceHierarchyNode[], nodesAlreadyGrouped: ProcessedInstancesGroupingHierarchyNode[], handlerGroupingParams: PropertyGroupInfo, valueFormatter: IPrimitiveValueFormatter, localizedStrings: PropertiesGroupingLocalizedStrings, classHierarchyInspector: ECClassHierarchyInspector): Promise<GroupingHandlerResult>;
+export declare function createPropertyGroups(nodesToGroup: ProcessedInstanceHierarchyNode[], nodesAlreadyGrouped: ProcessedInstancesGroupingHierarchyNode[], handlerGroupingParams: PropertyGroupInfo, valueFormatter: IPrimitiveValueFormatter, localizedStrings: PropertiesGroupingLocalizedStrings, classHierarchyInspector: Pick<ECSchemaProvider, "classDerivesFrom">): Promise<GroupingHandlerResult>;
 /** @internal */
 export declare function getUniquePropertiesGroupInfo(schemaProvider: ECSchemaProvider, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[]): Promise<Array<PropertyGroupInfo>>;
 /** @internal */
@@ -28,5 +28,5 @@ export declare function doPreviousPropertiesMatch(previousPropertiesGroupingInfo
 /** @internal */
 export declare function doRangesMatch(ranges1: HierarchyNodePropertyValueRange[] | undefined, ranges2: HierarchyNodePropertyValueRange[] | undefined): boolean;
 /** @internal */
-export declare function createPropertiesGroupingHandlers(imodelAccess: ECSchemaProvider & ECClassHierarchyInspector, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[], valueFormatter: IPrimitiveValueFormatter, localizedStrings: PropertiesGroupingLocalizedStrings): Promise<GroupingHandler[]>;
+export declare function createPropertiesGroupingHandlers(imodelAccess: ECSchemaProvider, parentNode: ParentHierarchyNode | undefined, nodes: ProcessedInstanceHierarchyNode[], valueFormatter: IPrimitiveValueFormatter, localizedStrings: PropertiesGroupingLocalizedStrings): Promise<GroupingHandler[]>;
 //# sourceMappingURL=PropertiesGrouping.d.ts.map

package/lib/hierarchies/imodel/operators/grouping/PropertiesGrouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PropertiesGrouping.d.ts","sourceRoot":"","sources":["../../../../../src/hierarchies/imodel/operators/grouping/PropertiesGrouping.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAgB,EAAE,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC/G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EACV,qCAAqC,EACrC,0BAA0B,EAC1B,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,uCAAuC,EAAE,MAAM,gBAAgB,CAAC;AAetH,gBAAgB;AAChB,MAAM,WAAW,kCAAkC;IACjD,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,gBAAgB;AAChB,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC;IAClB,8BAA8B,EAAE,8BAA8B,CAAC;IAC/D,aAAa,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,CAAC;CAClE;AAED,gBAAgB;AAChB,MAAM,MAAM,8BAA8B,GAAG,KAAK,CAAC;IACjD,mBAAmB,EAAE,EAAE,CAAC,wBAAwB,CAAC;IACjD,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC,CAAC;AAEH,gBAAgB;AAChB,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,8BAA8B,EAAE,EAC9C,mBAAmB,EAAE,uCAAuC,EAAE,EAC9D,qBAAqB,EAAE,iBAAiB,EACxC,cAAc,EAAE,wBAAwB,EACxC,gBAAgB,EAAE,kCAAkC,EACpD,uBAAuB,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,GAClE,OAAO,CAAC,qBAAqB,CAAC,CAwKhC;AA8ED,gBAAgB;AAChB,wBAAsB,4BAA4B,CAChD,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,mBAAmB,GAAG,SAAS,EAC3C,KAAK,EAAE,8BAA8B,EAAE,GACtC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAqEnC;AAqCD,gBAAgB;AAChB,wBAAgB,yBAAyB,CACvC,8BAA8B,EAAE,8BAA8B,EAC9D,eAAe,EAAE,qCAAqC,GACrD,OAAO,CAUT;AAED,gBAAgB;AAChB,wBAAgB,aAAa,CAC3B,OAAO,EAAE,+BAA+B,EAAE,GAAG,SAAS,EACtD,OAAO,EAAE,+BAA+B,EAAE,GAAG,SAAS,GACrD,OAAO,CA8BT;AAED,gBAAgB;AAChB,wBAAsB,gCAAgC,CACpD,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,mBAAmB,GAAG,SAAS,EAC3C,KAAK,EAAE,8BAA8B,EAAE,EACvC,cAAc,EAAE,wBAAwB,EACxC,gBAAgB,EAAE,kCAAkC,GACnD,OAAO,CAAC,eAAe,EAAE,CAAC,CAa5B"}

package/lib/{esm/hierarchies → hierarchies}/imodel/operators/grouping/PropertiesGrouping.js

@@ -18,10 +18,7 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
         }
         otherValuesGrouping ??= {
             node: {
-                key: {
-                    type: "property-grouping:other",
-                    properties: [],
-                },
+                key: { type: "property-grouping:other", properties: [] },
                 parentKeys: [],
                 groupedInstanceKeys: [],
                 label: localizedStrings.other,
@@ -45,22 +42,20 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
             continue;
         }
         const currentProperty = byProperties.propertyGroups[handlerGroupingParams.previousPropertiesGroupingInfo.length];
-        const propertyIdentifier = {
-            propertyName: currentProperty.propertyName,
-            propertyClassName: byProperties.propertiesClassName,
-        };
         const propertyClass = handlerGroupingParams.ecClass;
-        const property = await propertyClass.getProperty(currentProperty.propertyName);
-        if (!property?.isNavigation() && (!property?.isPrimitive() || property.primitiveType === "Binary" || property.primitiveType === "IGeometry")) {
+        const property = propertyClass.getProperty(currentProperty.propertyName);
+        if (!property?.isNavigation() &&
+            (!property?.isPrimitive() || property.primitiveType === "Binary" || property.primitiveType === "IGeometry")) {
             groupings.ungrouped.push(node);
             continue;
         }
+        const propertyIdentifier = { propertyName: property.name, propertyClassName: property.class.fullName };
         const extendedTypeName = "extendedTypeName" in property ? property.extendedTypeName : undefined;
         const primitiveType = "primitiveType" in property ? property.primitiveType : "String";
         assert(primitiveType !== "Binary" && primitiveType !== "IGeometry");
         if (!currentProperty.propertyValue) {
             if (byProperties.createGroupForUnspecifiedValues) {
-                addGroupingToMap(groupings.grouped, `${currentProperty.propertyName}:Unspecified`, {
+                addGroupingToMap(groupings.grouped, `${propertyIdentifier.propertyName}:Unspecified`, {
                     label: localizedStrings.unspecified,
                     propertyGroupingNodeKey: {
                         type: "property-grouping:value",
@@ -73,7 +68,7 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
             groupings.ungrouped.push(node);
             continue;
         }
-        const koqName = (await property.kindOfQuantity)?.fullName;
+        const koqName = property.kindOfQuantity?.fullName;
         if (currentProperty.ranges) {
             if (typeof currentProperty.propertyValue === "number") {
                 const propValue = currentProperty.propertyValue;
@@ -91,8 +86,9 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
                         koqName,
                         value: matchingRange.toValue,
                     };
-                    const rangeLabel = matchingRange.rangeLabel ?? `${await valueFormatter(fromValueTypedPrimitive)} - ${await valueFormatter(toValueTypedPrimitive)}`;
-                    addGroupingToMap(groupings.grouped, `${currentProperty.propertyName}:[${matchingRange.fromValue}-${matchingRange.toValue}]${matchingRange.rangeLabel ? `(${matchingRange.rangeLabel})` : ""}`, {
+                    const rangeLabel = matchingRange.rangeLabel ??
+                        `${await valueFormatter(fromValueTypedPrimitive)} - ${await valueFormatter(toValueTypedPrimitive)}`;
+                    addGroupingToMap(groupings.grouped, `${propertyIdentifier.propertyName}:[${matchingRange.fromValue}-${matchingRange.toValue}]${matchingRange.rangeLabel ? `(${matchingRange.rangeLabel})` : ""}`, {
                         label: rangeLabel,
                         propertyGroupingNodeKey: {
                             ...propertyIdentifier,
@@ -126,7 +122,7 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
         const formattedValue = currentProperty.propertyValue instanceof Array
             ? await formatConcatenatedValue({ value: currentProperty.propertyValue, valueFormatter })
             : await valueFormatter(TypedPrimitiveValue.create(currentProperty.propertyValue, primitiveType, koqName, extendedTypeName));
-        addGroupingToMap(groupings.grouped, `${currentProperty.propertyName}:${formattedValue}`, {
+        addGroupingToMap(groupings.grouped, `${propertyIdentifier.propertyName}:${formattedValue}`, {
             label: formattedValue,
             propertyGroupingNodeKey: {
                 ...propertyIdentifier,
@@ -140,10 +136,7 @@ export async function createPropertyGroups(nodesToGroup, nodesAlreadyGrouped, ha
 function addGroupingToMap(groupingMap, mapKey, propertyToAdd, node) {
     let groupingInfo = groupingMap.get(mapKey);
     if (!groupingInfo) {
-        groupingInfo = {
-            displayablePropertyGroupingInfo: propertyToAdd,
-            groupedNodes: [node],
-        };
+        groupingInfo = { displayablePropertyGroupingInfo: propertyToAdd, groupedNodes: [node] };
         groupingMap.set(mapKey, groupingInfo);
         return;
     }
@@ -201,46 +194,58 @@ export async function getUniquePropertiesGroupInfo(schemaProvider, parentNode, n
     const releaseMainThread = createMainThreadReleaseOnTimePassedHandler();
     const parentPropertyGroupPath = parentNode ? createNodePropertyGroupPathMatchers(parentNode) : [];
     const uniqueProperties = new Map();
+    // `getClass` resolves the same class for every node sharing a `propertiesClassName`, so resolve each class once and
+    // reuse it across nodes instead of calling `getClass` (schema lookup + class lookup) on every node.
+    const propertiesClassCache = new Map();
+    const getPropertiesClass = async (fullClassName) => {
+        let ecClass = propertiesClassCache.get(fullClassName);
+        if (!ecClass) {
+            ecClass = await getClass(schemaProvider, fullClassName);
+            propertiesClassCache.set(fullClassName, ecClass);
+        }
+        return ecClass;
+    };
     for (const node of nodes) {
         await releaseMainThread();
         const byProperties = node.processingParams?.grouping?.byProperties;
         if (!byProperties) {
             continue;
         }
+        const propertiesClass = await getPropertiesClass(byProperties.propertiesClassName);
         let propertyGroupIndex = 0;
         const previousPropertiesInfo = new Array();
         for (const propertyGroup of byProperties.propertyGroups) {
+            const property = propertiesClass.getProperty(propertyGroup.propertyName);
+            const propertyName = property?.name ?? propertyGroup.propertyName;
+            const propertyClassName = property?.class.fullName ?? propertiesClass.fullName;
             const mapKeyRanges = getRangesAsString(propertyGroup.ranges);
-            const lastKey = previousPropertiesInfo.length > 0 ? previousPropertiesInfo[previousPropertiesInfo.length - 1].propertyGroupKey : "";
-            const propertyGroupKey = `${lastKey}:${propertyGroup.propertyName}(${mapKeyRanges})`;
-            const mapKey = `${byProperties.propertiesClassName}:${propertyGroupKey}`;
+            const lastKey = previousPropertiesInfo.length > 0
+                ? previousPropertiesInfo[previousPropertiesInfo.length - 1].propertyGroupKey
+                : "";
+            const propertyGroupKey = `${lastKey}:${propertyName}(${mapKeyRanges})`;
+            const mapKey = `${propertiesClass.fullName}:${propertyGroupKey}`;
             let isAlreadyGrouped = false;
-            if (!isAlreadyGrouped && parentPropertyGroupPath.length > 0 && propertyGroupIndex < parentPropertyGroupPath.length) {
+            if (parentPropertyGroupPath.length > 0 && propertyGroupIndex < parentPropertyGroupPath.length) {
                 const groupMatcher = parentPropertyGroupPath[propertyGroupIndex];
                 isAlreadyGrouped = groupMatcher({
-                    propertiesClassName: byProperties.propertiesClassName,
-                    propertyName: propertyGroup.propertyName,
+                    propertiesClassName: propertyClassName,
+                    propertyName,
                     isRange: !!propertyGroup.ranges,
                 });
             }
             if (!isAlreadyGrouped && !uniqueProperties.get(mapKey)) {
                 uniqueProperties.set(mapKey, {
-                    ecClass: await getClass(schemaProvider, byProperties.propertiesClassName),
-                    propertyGroup: {
-                        propertyName: propertyGroup.propertyName,
-                        ranges: propertyGroup.ranges,
-                    },
+                    ecClass: propertiesClass,
+                    propertyGroup: { propertyName, ranges: propertyGroup.ranges },
                     previousPropertiesGroupingInfo: previousPropertiesInfo.map((groupingInfo) => ({
-                        propertiesClassName: byProperties.propertiesClassName,
+                        propertiesClassName: propertiesClass.getProperty(groupingInfo.propertyGroup.propertyName)?.class.fullName ??
+                            propertiesClass.fullName,
                         propertyName: groupingInfo.propertyGroup.propertyName,
                         isRange: !!groupingInfo.propertyGroup.ranges,
                     })),
                 });
             }
-            previousPropertiesInfo.push({
-                propertyGroup,
-                propertyGroupKey,
-            });
+            previousPropertiesInfo.push({ propertyGroup: { ...propertyGroup, propertyName }, propertyGroupKey });
             ++propertyGroupIndex;
         }
     }
@@ -291,8 +296,12 @@ export function doRangesMatch(ranges1, ranges2) {
     }
     return (
     // Check twice, to validate if both ranges have the same elements (elements can be in a different order)
-    ranges1.every((lhsRange) => ranges2.some((rhsRange) => lhsRange.fromValue === rhsRange.fromValue && lhsRange.toValue === rhsRange.toValue && lhsRange.rangeLabel === rhsRange.rangeLabel)) &&
-        ranges2.every((lhsRange) => ranges1.some((rhsRange) => lhsRange.fromValue === rhsRange.fromValue && lhsRange.toValue === rhsRange.toValue && lhsRange.rangeLabel === rhsRange.rangeLabel)));
+    ranges1.every((lhsRange) => ranges2.some((rhsRange) => lhsRange.fromValue === rhsRange.fromValue &&
+        lhsRange.toValue === rhsRange.toValue &&
+        lhsRange.rangeLabel === rhsRange.rangeLabel)) &&
+        ranges2.every((lhsRange) => ranges1.some((rhsRange) => lhsRange.fromValue === rhsRange.fromValue &&
+            lhsRange.toValue === rhsRange.toValue &&
+            lhsRange.rangeLabel === rhsRange.rangeLabel)));
 }
 /** @internal */
 export async function createPropertiesGroupingHandlers(imodelAccess, parentNode, nodes, valueFormatter, localizedStrings) {