@itwin/presentation-hierarchies 1.0.0 → 1.2.0

package/lib/cjs/hierarchies/imodel/FilteringHierarchyDefinition.js

@@ -4,14 +4,14 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = exports.ECSQL_COLUMN_NAME_FilterTargetOptions = exports.ECSQL_COLUMN_NAME_IsFilterTarget = exports.ECSQL_COLUMN_NAME_FilteredChildrenPaths = exports.FilteringHierarchyDefinition = void 0;
+exports.ECSQL_COLUMN_NAME_FilterClassName = exports.ECSQL_COLUMN_NAME_FilterECInstanceId = exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = exports.FilteringHierarchyDefinition = void 0;
 exports.applyECInstanceIdsFilter = applyECInstanceIdsFilter;
-const HierarchyFiltering_1 = require("../HierarchyFiltering");
-const HierarchyNode_1 = require("../HierarchyNode");
-const HierarchyNodeIdentifier_1 = require("../HierarchyNodeIdentifier");
-const IModelHierarchyDefinition_1 = require("./IModelHierarchyDefinition");
-const IModelHierarchyNode_1 = require("./IModelHierarchyNode");
-const TreeNodesReader_1 = require("./TreeNodesReader");
+const HierarchyFiltering_js_1 = require("../HierarchyFiltering.js");
+const HierarchyNode_js_1 = require("../HierarchyNode.js");
+const HierarchyNodeIdentifier_js_1 = require("../HierarchyNodeIdentifier.js");
+const IModelHierarchyDefinition_js_1 = require("./IModelHierarchyDefinition.js");
+const IModelHierarchyNode_js_1 = require("./IModelHierarchyNode.js");
+const TreeNodesReader_js_1 = require("./TreeNodesReader.js");
 /** @internal */
 class FilteringHierarchyDefinition {
     _imodelAccess;
@@ -34,7 +34,7 @@ class FilteringHierarchyDefinition {
     }
     shouldExpandGroupingNode(node) {
         for (const child of node.children) {
-            // istanbul ignore next
+            /* c8 ignore next 3 */
             if (!child.filtering) {
                 continue;
             }
@@ -57,7 +57,7 @@ class FilteringHierarchyDefinition {
                 }
             }
             if (!child.filtering.filteredChildrenIdentifierPaths) {
-                // istanbul ignore next
+                /* c8 ignore next */
                 continue;
             }
             for (const path of child.filtering.filteredChildrenIdentifierPaths) {
@@ -72,23 +72,22 @@ class FilteringHierarchyDefinition {
         return async (node) => {
             const processedNode = this._source.postProcessNode ? await this._source.postProcessNode(node) : node;
             // instance nodes get the auto-expand flag in `parseNode`, but grouping ones need to be handled during post-processing
-            if (IModelHierarchyNode_1.ProcessedHierarchyNode.isGroupingNode(node) && this.shouldExpandGroupingNode(node)) {
+            if (IModelHierarchyNode_js_1.ProcessedHierarchyNode.isGroupingNode(node) && this.shouldExpandGroupingNode(node)) {
                 Object.assign(processedNode, { autoExpand: true });
             }
             return processedNode;
         };
     }
     get parseNode() {
-        return (row) => {
+        return async (row, parentNode) => {
             const hasFilterTargetAncestor = !!row[exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor];
-            const isFilterTarget = !!row[exports.ECSQL_COLUMN_NAME_IsFilterTarget];
-            const filterTargetOptions = row[exports.ECSQL_COLUMN_NAME_FilterTargetOptions]
-                ? JSON.parse(row[exports.ECSQL_COLUMN_NAME_FilterTargetOptions])
-                : undefined;
-            const filteredChildrenIdentifierPaths = row[exports.ECSQL_COLUMN_NAME_FilteredChildrenPaths]
-                ? JSON.parse(row[exports.ECSQL_COLUMN_NAME_FilteredChildrenPaths])
-                : undefined;
-            const defaultNode = (this._source.parseNode ?? TreeNodesReader_1.defaultNodesParser)(row);
+            const { filteredChildrenIdentifierPaths, filterTargetOptions, isFilterTarget } = row[exports.ECSQL_COLUMN_NAME_FilterECInstanceId] && row[exports.ECSQL_COLUMN_NAME_FilterClassName]
+                ? await this.getChildrenIdentifierPaths(parentNode?.filtering?.filteredChildrenIdentifierPaths ?? this._nodeIdentifierPaths, {
+                    className: row[exports.ECSQL_COLUMN_NAME_FilterClassName],
+                    id: row[exports.ECSQL_COLUMN_NAME_FilterECInstanceId],
+                })
+                : { filteredChildrenIdentifierPaths: [], filterTargetOptions: undefined, isFilterTarget: false };
+            const defaultNode = await (this._source.parseNode ?? TreeNodesReader_js_1.defaultNodesParser)(row);
             return applyFilterAttributes({
                 node: defaultNode,
                 filteredChildrenIdentifierPaths,
@@ -98,18 +97,61 @@ class FilteringHierarchyDefinition {
             });
         };
     }
+    async getChildrenIdentifierPaths(filteredChildrenNodeIdentifierPaths, providedIdentifier) {
+        const { id, className } = providedIdentifier;
+        let filteredChildrenIdentifierPaths;
+        let isFilterTarget = false;
+        let filterTargetOptions;
+        for (const filteredChildrenNodeIdentifierPath of filteredChildrenNodeIdentifierPaths) {
+            const { path, options } = HierarchyFiltering_js_1.HierarchyFilteringPath.normalize(filteredChildrenNodeIdentifierPath);
+            /* c8 ignore next 3 */
+            if (path.length === 0) {
+                continue;
+            }
+            // We need to check if identifiers have the same id and imodelKey and are
+            // of the same class / derived class / is derived from class
+            const identifier = path[0];
+            if (identifier.id !== id) {
+                continue;
+            }
+            if (HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {
+                if (identifier.imodelKey && identifier.imodelKey !== this._imodelAccess.imodelKey) {
+                    continue;
+                }
+                if (identifier.className !== className &&
+                    !(await this._imodelAccess.classDerivesFrom(identifier.className, className)) &&
+                    !(await this._imodelAccess.classDerivesFrom(className, identifier.className))) {
+                    continue;
+                }
+            }
+            if (!filteredChildrenIdentifierPaths) {
+                filteredChildrenIdentifierPaths = [];
+            }
+            if (path.length > 1) {
+                filteredChildrenIdentifierPaths.push(options ? { path: path.slice(1), options } : path.slice(1));
+            }
+            else if (isFilterTarget) {
+                filterTargetOptions = HierarchyFiltering_js_1.HierarchyFilteringPath.mergeOptions(filterTargetOptions, options);
+            }
+            else {
+                isFilterTarget = true;
+                filterTargetOptions = options;
+            }
+        }
+        return { filteredChildrenIdentifierPaths, filterTargetOptions, isFilterTarget };
+    }
     async defineHierarchyLevel(props) {
         const sourceDefinitions = await this._source.defineHierarchyLevel(props);
-        const filteringProps = (0, HierarchyFiltering_1.extractFilteringProps)(this._nodeIdentifierPaths, props.parentNode);
+        const filteringProps = (0, HierarchyFiltering_js_1.extractFilteringProps)(this._nodeIdentifierPaths, props.parentNode);
         if (!filteringProps) {
             return sourceDefinitions;
         }
         const filteredDefinitions = [];
         await Promise.all(sourceDefinitions.map(async (definition) => {
             let matchedDefinition;
-            if (IModelHierarchyDefinition_1.HierarchyNodesDefinition.isGenericNode(definition)) {
+            if (IModelHierarchyDefinition_js_1.HierarchyNodesDefinition.isGenericNode(definition)) {
                 matchedDefinition = await matchFilters(definition, filteringProps, async (id) => {
-                    return (HierarchyNodeIdentifier_1.HierarchyNodeIdentifier.isGenericNodeIdentifier(id) &&
+                    return (HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isGenericNodeIdentifier(id) &&
                         (!id.source || id.source === this._imodelAccess.imodelKey) &&
                         id.id === definition.node.key);
                 }, this._imodelAccess, (def, matchingFilters) => {
@@ -120,6 +162,7 @@ class FilteringHierarchyDefinition {
                             node: def.node,
                             filteredChildrenIdentifierPaths,
                             isFilterTarget: matchingFilters.some((mc) => mc.isFilterTarget),
+                            filterTargetOptions: matchingFilters.find((mc) => mc.isFilterTarget)?.filterTargetOptions,
                             hasFilterTargetAncestor: filteringProps.hasFilterTargetAncestor,
                         }),
                     };
@@ -127,10 +170,10 @@ class FilteringHierarchyDefinition {
             }
             else {
                 matchedDefinition = await matchFilters(definition, filteringProps, async (id) => {
-                    return (HierarchyNodeIdentifier_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(id) &&
+                    return (HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(id) &&
                         (!id.imodelKey || id.imodelKey === this._imodelAccess.imodelKey) &&
                         (await this._imodelAccess.classDerivesFrom(id.className, definition.fullClassName)));
-                }, this._imodelAccess, (def, matchingFilters) => applyECInstanceIdsFilter(def, matchingFilters, !!filteringProps.hasFilterTargetAncestor));
+                }, this._imodelAccess, (def, matchingFilters) => applyECInstanceIdsFilter(def, matchingFilters, !!filteringProps.hasFilterTargetAncestor), false);
             }
             if (matchedDefinition) {
                 filteredDefinitions.push(matchedDefinition);
@@ -140,11 +183,11 @@ class FilteringHierarchyDefinition {
     }
 }
 exports.FilteringHierarchyDefinition = FilteringHierarchyDefinition;
-async function matchFilters(definition, filteringProps, predicate, classHierarchy, matchedDefinitionProcessor) {
+async function matchFilters(definition, filteringProps, predicate, classHierarchy, matchedDefinitionProcessor, extractPathsAndOptions = true) {
     const { filteredNodePaths, hasFilterTargetAncestor } = filteringProps;
     const matchingFilters = [];
     for (const filteredNodePath of filteredNodePaths) {
-        const { path, options } = HierarchyFiltering_1.HierarchyFilteringPath.normalize(filteredNodePath);
+        const { path, options } = HierarchyFiltering_js_1.HierarchyFilteringPath.normalize(filteredNodePath);
         if (path.length === 0) {
             continue;
         }
@@ -161,12 +204,14 @@ async function matchFilters(definition, filteringProps, predicate, classHierarch
                 };
                 matchingFilters.push(entry);
             }
-            const remainingPath = path.slice(1);
-            if (remainingPath.length > 0) {
-                entry.childrenIdentifierPaths.push(options ? { path: remainingPath, options } : remainingPath);
+            if (!extractPathsAndOptions) {
+                continue;
+            }
+            if (path.length > 1) {
+                entry.childrenIdentifierPaths.push(options ? { path: path.slice(1), options } : path.slice(1));
             }
             else if (entry.isFilterTarget) {
-                entry.filterTargetOptions = HierarchyFiltering_1.HierarchyFilteringPath.mergeOptions(entry.filterTargetOptions, options);
+                entry.filterTargetOptions = HierarchyFiltering_js_1.HierarchyFilteringPath.mergeOptions(entry.filterTargetOptions, options);
             }
             else {
                 Object.assign(entry, { isFilterTarget: true, filterTargetOptions: options });
@@ -187,24 +232,24 @@ async function findMatchingFilterEntry(filters, nodeId, classHierarchy) {
     return undefined;
 }
 async function identifiersEqual(lhs, rhs, classHierarchy) {
-    if (HierarchyNodeIdentifier_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(lhs) && HierarchyNodeIdentifier_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(rhs)) {
+    if (HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(lhs) && HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(rhs)) {
         return (lhs.id === rhs.id &&
             (lhs.className === rhs.className ||
                 (await classHierarchy.classDerivesFrom(lhs.className, rhs.className)) ||
                 (await classHierarchy.classDerivesFrom(rhs.className, lhs.className))));
     }
-    return HierarchyNodeIdentifier_1.HierarchyNodeIdentifier.equal(lhs, rhs);
+    return HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.equal(lhs, rhs);
 }
 function applyFilterAttributes(props) {
     const { node, filteredChildrenIdentifierPaths } = props;
     const result = { ...node };
     const shouldAutoExpand = !!filteredChildrenIdentifierPaths?.some((childPath) => {
-        return !!HierarchyFiltering_1.HierarchyFilteringPath.normalize(childPath).options?.autoExpand;
+        return !!HierarchyFiltering_js_1.HierarchyFilteringPath.normalize(childPath).options?.autoExpand;
     });
     if (shouldAutoExpand) {
         result.autoExpand = true;
     }
-    const filteringProps = HierarchyNode_1.HierarchyNodeFilteringProps.create(props);
+    const filteringProps = HierarchyNode_js_1.HierarchyNodeFilteringProps.create(props);
     if (filteringProps) {
         result.filtering = filteringProps;
     }
@@ -212,44 +257,53 @@ function applyFilterAttributes(props) {
 }
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-exports.ECSQL_COLUMN_NAME_FilteredChildrenPaths = "FilteredChildrenPaths";
-/** @internal */
-// eslint-disable-next-line @typescript-eslint/naming-convention
-exports.ECSQL_COLUMN_NAME_IsFilterTarget = "IsFilterTarget";
+exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = "HasFilterTargetAncestor";
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-exports.ECSQL_COLUMN_NAME_FilterTargetOptions = "FilterTargetOptions";
+exports.ECSQL_COLUMN_NAME_FilterECInstanceId = "FilterECInstanceId";
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = "HasFilterTargetAncestor";
+exports.ECSQL_COLUMN_NAME_FilterClassName = "FilterClassName";
+function getClassECInstanceIds(matchingFilters) {
+    const classNameECInstanceIds = new Map();
+    for (const matchingFilter of matchingFilters) {
+        const entry = classNameECInstanceIds.get(matchingFilter.id.className);
+        if (entry === undefined) {
+            classNameECInstanceIds.set(matchingFilter.id.className, [matchingFilter.id.id]);
+            continue;
+        }
+        entry.push(matchingFilter.id.id);
+    }
+    return classNameECInstanceIds;
+}
 /** @internal */
 function applyECInstanceIdsFilter(def, matchingFilters, hasFilterTargetAncestor) {
     if (matchingFilters.length === 0) {
         return def;
     }
+    const matchingFiltersToUse = getClassECInstanceIds(matchingFilters);
     return {
         ...def,
         query: {
             ...def.query,
             ctes: [
                 ...(def.query.ctes ?? []),
-                // note: generally we'd use `VALUES (1,1),(2,2)`, but that doesn't work in ECSQL (https://github.com/iTwin/itwinjs-backlog/issues/865),
-                // so using UNION as a workaround
-                `FilteringInfo(ECInstanceId, IsFilterTarget, FilterTargetOptions, FilteredChildrenPaths) AS (
-          ${matchingFilters
-                    .map((mc) => mc.isFilterTarget
-                    ? `VALUES (${mc.id.id}, 1, ${mc.filterTargetOptions ? `'${JSON.stringify(mc.filterTargetOptions)}'` : "CAST(NULL AS TEXT)"}, '${JSON.stringify(mc.childrenIdentifierPaths)}')`
-                    : `VALUES (${mc.id.id}, 0, CAST(NULL AS TEXT), '${JSON.stringify(mc.childrenIdentifierPaths)}')`)
+                `FilteringInfo(ECInstanceId, FilterClassName) AS (
+          ${Array.from(matchingFiltersToUse)
+                    .map(([className, ecInstanceIds]) => `
+                SELECT ECInstanceId, '${className}' AS FilterClassName
+                FROM ${className}
+                WHERE ECInstanceId IN (${ecInstanceIds.join(", ")})
+              `)
                     .join(" UNION ALL ")}
         )`,
             ],
             ecsql: `
         SELECT
           [q].*,
-          [f].[IsFilterTarget] AS [${exports.ECSQL_COLUMN_NAME_IsFilterTarget}],
-          [f].[FilterTargetOptions] AS [${exports.ECSQL_COLUMN_NAME_FilterTargetOptions}],
           ${hasFilterTargetAncestor ? "1" : "0"} AS [${exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor}],
-          [f].[FilteredChildrenPaths] AS [${exports.ECSQL_COLUMN_NAME_FilteredChildrenPaths}]
+          IdToHex([f].[ECInstanceId]) AS [${exports.ECSQL_COLUMN_NAME_FilterECInstanceId}],
+          [f].[FilterClassName] AS [${exports.ECSQL_COLUMN_NAME_FilterClassName}]
         FROM (
           ${def.query.ecsql}
         ) [q]

package/lib/cjs/hierarchies/imodel/FilteringHierarchyDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilteringHierarchyDefinition.js","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/FilteringHierarchyDefinition.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 { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\nimport { extractFilteringProps, HierarchyFilteringPath, HierarchyFilteringPathOptions } from \"../HierarchyFiltering\";\nimport { HierarchyNodeFilteringProps } from \"../HierarchyNode\";\nimport { HierarchyNodeIdentifier } from \"../HierarchyNodeIdentifier\";\nimport { GenericNodeKey } from \"../HierarchyNodeKey\";\nimport {\n  DefineHierarchyLevelProps,\n  GenericHierarchyNodeDefinition,\n  HierarchyDefinition,\n  HierarchyLevelDefinition,\n  HierarchyNodesDefinition,\n  InstanceNodesQueryDefinition,\n  NodeParser,\n  NodePostProcessor,\n  NodePreProcessor,\n} from \"./IModelHierarchyDefinition\";\nimport { ProcessedGroupingHierarchyNode, ProcessedHierarchyNode, SourceHierarchyNode, SourceInstanceHierarchyNode } from \"./IModelHierarchyNode\";\nimport { defaultNodesParser } from \"./TreeNodesReader\";\n\ninterface FilteringHierarchyDefinitionProps {\n  imodelAccess: ECClassHierarchyInspector & { imodelKey: string };\n  source: HierarchyDefinition;\n  nodeIdentifierPaths: HierarchyFilteringPath[];\n}\n\n/** @internal */\nexport class FilteringHierarchyDefinition implements HierarchyDefinition {\n  private _imodelAccess: ECClassHierarchyInspector & { imodelKey: string };\n  private _source: HierarchyDefinition;\n  private _nodeIdentifierPaths: HierarchyFilteringPath[];\n\n  public constructor(props: FilteringHierarchyDefinitionProps) {\n    this._imodelAccess = props.imodelAccess;\n    this._source = props.source;\n    this._nodeIdentifierPaths = props.nodeIdentifierPaths;\n  }\n\n  public get preProcessNode(): NodePreProcessor {\n    return async (node) => {\n      const processedNode = this._source.preProcessNode ? await this._source.preProcessNode(node) : node;\n      if (processedNode?.processingParams?.hideInHierarchy && processedNode.filtering?.isFilterTarget && !processedNode.filtering.hasFilterTargetAncestor) {\n        // we want to hide target nodes if they have `hideInHierarchy` param, but only if they're not under another filter target\n        return undefined;\n      }\n      return processedNode;\n    };\n  }\n\n  private shouldExpandGroupingNode(node: ProcessedGroupingHierarchyNode) {\n    for (const child of node.children) {\n      // istanbul ignore next\n      if (!child.filtering) {\n        continue;\n      }\n\n      if (child.filtering.isFilterTarget) {\n        const childAutoExpand = child.filtering.filterTargetOptions?.autoExpand;\n\n        // If child is a filter target and is has no `autoExpand` flag, then it's always to be expanded.\n        if (childAutoExpand === true) {\n          return true;\n        }\n\n        // If it's not an object and not `true`, then it's falsy - continue looking\n        if (typeof childAutoExpand !== \"object\") {\n          continue;\n        }\n\n        // If grouping node's child has `autoExpandUntil` flag,\n        // auto-expand the grouping node only if it's depth is lower than that of the grouping node in associated with the target.\n        const nodeDepth = node.parentKeys.length;\n        const filterTargetDepth = childAutoExpand.depth;\n        if (nodeDepth < filterTargetDepth) {\n          return true;\n        }\n      }\n\n      if (!child.filtering.filteredChildrenIdentifierPaths) {\n        // istanbul ignore next\n        continue;\n      }\n\n      for (const path of child.filtering.filteredChildrenIdentifierPaths) {\n        if (\"path\" in path && path.options?.autoExpand) {\n          return true;\n        }\n      }\n    }\n    return false;\n  }\n\n  public get postProcessNode(): NodePostProcessor {\n    return async (node: ProcessedHierarchyNode) => {\n      const processedNode = this._source.postProcessNode ? await this._source.postProcessNode(node) : node;\n      // instance nodes get the auto-expand flag in `parseNode`, but grouping ones need to be handled during post-processing\n      if (ProcessedHierarchyNode.isGroupingNode(node) && this.shouldExpandGroupingNode(node)) {\n        Object.assign(processedNode, { autoExpand: true });\n      }\n      return processedNode;\n    };\n  }\n\n  public get parseNode(): NodeParser {\n    return (row: { [columnName: string]: any }): SourceInstanceHierarchyNode => {\n      const hasFilterTargetAncestor: boolean = !!row[ECSQL_COLUMN_NAME_HasFilterTargetAncestor];\n      const isFilterTarget: boolean = !!row[ECSQL_COLUMN_NAME_IsFilterTarget];\n      const filterTargetOptions: HierarchyFilteringPathOptions | undefined = row[ECSQL_COLUMN_NAME_FilterTargetOptions]\n        ? JSON.parse(row[ECSQL_COLUMN_NAME_FilterTargetOptions])\n        : undefined;\n      const filteredChildrenIdentifierPaths: HierarchyFilteringPath[] | undefined = row[ECSQL_COLUMN_NAME_FilteredChildrenPaths]\n        ? JSON.parse(row[ECSQL_COLUMN_NAME_FilteredChildrenPaths])\n        : undefined;\n      const defaultNode = (this._source.parseNode ?? defaultNodesParser)(row);\n      return applyFilterAttributes({\n        node: defaultNode,\n        filteredChildrenIdentifierPaths,\n        isFilterTarget,\n        filterTargetOptions,\n        hasFilterTargetAncestor,\n      });\n    };\n  }\n\n  public async defineHierarchyLevel(props: DefineHierarchyLevelProps): Promise<HierarchyLevelDefinition> {\n    const sourceDefinitions = await this._source.defineHierarchyLevel(props);\n    const filteringProps = extractFilteringProps(this._nodeIdentifierPaths, props.parentNode);\n    if (!filteringProps) {\n      return sourceDefinitions;\n    }\n\n    const filteredDefinitions: HierarchyLevelDefinition = [];\n    await Promise.all(\n      sourceDefinitions.map(async (definition) => {\n        let matchedDefinition: HierarchyNodesDefinition | undefined;\n        if (HierarchyNodesDefinition.isGenericNode(definition)) {\n          matchedDefinition = await matchFilters<GenericNodeKey>(\n            definition,\n            filteringProps,\n            async (id) => {\n              return (\n                HierarchyNodeIdentifier.isGenericNodeIdentifier(id) &&\n                (!id.source || id.source === this._imodelAccess.imodelKey) &&\n                id.id === definition.node.key\n              );\n            },\n            this._imodelAccess,\n            (def, matchingFilters) => {\n              const filteredChildrenIdentifierPaths = matchingFilters.reduce(\n                (r, c) => [...r, ...c.childrenIdentifierPaths],\n                new Array<HierarchyFilteringPath>(),\n              );\n              return {\n                ...def,\n                node: applyFilterAttributes({\n                  node: def.node,\n                  filteredChildrenIdentifierPaths,\n                  isFilterTarget: matchingFilters.some((mc) => mc.isFilterTarget),\n                  hasFilterTargetAncestor: filteringProps.hasFilterTargetAncestor,\n                }),\n              };\n            },\n          );\n        } else {\n          matchedDefinition = await matchFilters<InstanceKey>(\n            definition,\n            filteringProps,\n            async (id) => {\n              return (\n                HierarchyNodeIdentifier.isInstanceNodeIdentifier(id) &&\n                (!id.imodelKey || id.imodelKey === this._imodelAccess.imodelKey) &&\n                (await this._imodelAccess.classDerivesFrom(id.className, definition.fullClassName))\n              );\n            },\n            this._imodelAccess,\n            (def, matchingFilters) => applyECInstanceIdsFilter(def, matchingFilters, !!filteringProps.hasFilterTargetAncestor),\n          );\n        }\n        if (matchedDefinition) {\n          filteredDefinitions.push(matchedDefinition);\n        }\n      }),\n    );\n    return filteredDefinitions;\n  }\n}\n\ntype MatchedFilter<TIdentifier extends HierarchyNodeIdentifier> = {\n  id: TIdentifier;\n  childrenIdentifierPaths: HierarchyFilteringPath[];\n} & ({ isFilterTarget: false } | { isFilterTarget: true; filterTargetOptions?: HierarchyFilteringPathOptions });\n\nasync function matchFilters<\n  TIdentifier extends HierarchyNodeIdentifier,\n  TDefinition = TIdentifier extends InstanceKey ? InstanceNodesQueryDefinition : GenericHierarchyNodeDefinition,\n>(\n  definition: TDefinition,\n  filteringProps: { filteredNodePaths: HierarchyFilteringPath[]; hasFilterTargetAncestor?: boolean },\n  predicate: (id: HierarchyNodeIdentifier) => Promise<boolean>,\n  classHierarchy: ECClassHierarchyInspector,\n  matchedDefinitionProcessor: (def: TDefinition, matchingFilters: Array<MatchedFilter<TIdentifier>>) => TDefinition,\n): Promise<TDefinition | undefined> {\n  const { filteredNodePaths, hasFilterTargetAncestor } = filteringProps;\n  const matchingFilters: Array<MatchedFilter<TIdentifier>> = [];\n  for (const filteredNodePath of filteredNodePaths) {\n    const { path, options } = HierarchyFilteringPath.normalize(filteredNodePath);\n    if (path.length === 0) {\n      continue;\n    }\n    const nodeId = path[0];\n    if (await predicate(nodeId)) {\n      let entry = await findMatchingFilterEntry(matchingFilters, nodeId, classHierarchy);\n      if (!entry) {\n        entry = {\n          // ideally, `predicate` would act as a type guard to guarantee that `id` is `TIdentifier`, but at the moment\n          // async type guards aren't supported\n          id: nodeId as TIdentifier,\n          childrenIdentifierPaths: [],\n          isFilterTarget: false,\n        };\n        matchingFilters.push(entry);\n      }\n      const remainingPath = path.slice(1);\n      if (remainingPath.length > 0) {\n        entry.childrenIdentifierPaths.push(options ? { path: remainingPath, options } : remainingPath);\n      } else if (entry.isFilterTarget) {\n        entry.filterTargetOptions = HierarchyFilteringPath.mergeOptions(entry.filterTargetOptions, options);\n      } else {\n        Object.assign(entry, { isFilterTarget: true, filterTargetOptions: options });\n      }\n    }\n  }\n  if (hasFilterTargetAncestor || matchingFilters.length > 0) {\n    return matchedDefinitionProcessor(definition, matchingFilters);\n  }\n  return undefined;\n}\n\nasync function findMatchingFilterEntry<TEntry extends { id: TIdentifier }, TIdentifier extends HierarchyNodeIdentifier>(\n  filters: TEntry[],\n  nodeId: TIdentifier,\n  classHierarchy: ECClassHierarchyInspector,\n): Promise<TEntry | undefined> {\n  for (const filter of filters) {\n    if (await identifiersEqual(filter.id, nodeId, classHierarchy)) {\n      return filter;\n    }\n  }\n  return undefined;\n}\n\nasync function identifiersEqual<TIdentifier extends HierarchyNodeIdentifier>(lhs: TIdentifier, rhs: TIdentifier, classHierarchy: ECClassHierarchyInspector) {\n  if (HierarchyNodeIdentifier.isInstanceNodeIdentifier(lhs) && HierarchyNodeIdentifier.isInstanceNodeIdentifier(rhs)) {\n    return (\n      lhs.id === rhs.id &&\n      (lhs.className === rhs.className ||\n        (await classHierarchy.classDerivesFrom(lhs.className, rhs.className)) ||\n        (await classHierarchy.classDerivesFrom(rhs.className, lhs.className)))\n    );\n  }\n  return HierarchyNodeIdentifier.equal(lhs, rhs);\n}\n\nfunction applyFilterAttributes<TNode extends SourceHierarchyNode>(props: {\n  node: TNode;\n  filteredChildrenIdentifierPaths: HierarchyFilteringPath[] | undefined;\n  isFilterTarget?: boolean;\n  filterTargetOptions?: HierarchyFilteringPathOptions;\n  hasFilterTargetAncestor: boolean;\n}): TNode {\n  const { node, filteredChildrenIdentifierPaths } = props;\n  const result = { ...node };\n\n  const shouldAutoExpand = !!filteredChildrenIdentifierPaths?.some((childPath) => {\n    return !!HierarchyFilteringPath.normalize(childPath).options?.autoExpand;\n  });\n  if (shouldAutoExpand) {\n    result.autoExpand = true;\n  }\n\n  const filteringProps = HierarchyNodeFilteringProps.create(props);\n  if (filteringProps) {\n    result.filtering = filteringProps;\n  }\n\n  return result;\n}\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_FilteredChildrenPaths = \"FilteredChildrenPaths\";\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_IsFilterTarget = \"IsFilterTarget\";\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_FilterTargetOptions = \"FilterTargetOptions\";\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_HasFilterTargetAncestor = \"HasFilterTargetAncestor\";\n\n/** @internal */\nexport function applyECInstanceIdsFilter(\n  def: InstanceNodesQueryDefinition,\n  matchingFilters: Array<MatchedFilter<InstanceKey>>,\n  hasFilterTargetAncestor: boolean,\n): InstanceNodesQueryDefinition {\n  if (matchingFilters.length === 0) {\n    return def;\n  }\n  return {\n    ...def,\n    query: {\n      ...def.query,\n      ctes: [\n        ...(def.query.ctes ?? []),\n        // note: generally we'd use `VALUES (1,1),(2,2)`, but that doesn't work in ECSQL (https://github.com/iTwin/itwinjs-backlog/issues/865),\n        // so using UNION as a workaround\n        `FilteringInfo(ECInstanceId, IsFilterTarget, FilterTargetOptions, FilteredChildrenPaths) AS (\n          ${matchingFilters\n            .map((mc) =>\n              mc.isFilterTarget\n                ? `VALUES (${mc.id.id}, 1, ${mc.filterTargetOptions ? `'${JSON.stringify(mc.filterTargetOptions)}'` : \"CAST(NULL AS TEXT)\"}, '${JSON.stringify(mc.childrenIdentifierPaths)}')`\n                : `VALUES (${mc.id.id}, 0, CAST(NULL AS TEXT), '${JSON.stringify(mc.childrenIdentifierPaths)}')`,\n            )\n            .join(\" UNION ALL \")}\n        )`,\n      ],\n      ecsql: `\n        SELECT\n          [q].*,\n          [f].[IsFilterTarget] AS [${ECSQL_COLUMN_NAME_IsFilterTarget}],\n          [f].[FilterTargetOptions] AS [${ECSQL_COLUMN_NAME_FilterTargetOptions}],\n          ${hasFilterTargetAncestor ? \"1\" : \"0\"} AS [${ECSQL_COLUMN_NAME_HasFilterTargetAncestor}],\n          [f].[FilteredChildrenPaths] AS [${ECSQL_COLUMN_NAME_FilteredChildrenPaths}]\n        FROM (\n          ${def.query.ecsql}\n        ) [q]\n        ${hasFilterTargetAncestor ? \"LEFT \" : \"\"} JOIN FilteringInfo [f] ON [f].[ECInstanceId] = [q].[ECInstanceId]\n      `,\n    },\n  };\n}\n"]}
+{"version":3,"file":"FilteringHierarchyDefinition.js","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/FilteringHierarchyDefinition.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 { Id64String } from \"@itwin/core-bentley\";\nimport { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\nimport { extractFilteringProps, HierarchyFilteringPath, HierarchyFilteringPathOptions } from \"../HierarchyFiltering.js\";\nimport { HierarchyNodeFilteringProps } from \"../HierarchyNode.js\";\nimport { HierarchyNodeIdentifier } from \"../HierarchyNodeIdentifier.js\";\nimport { GenericNodeKey } from \"../HierarchyNodeKey.js\";\nimport {\n  DefineHierarchyLevelProps,\n  GenericHierarchyNodeDefinition,\n  HierarchyDefinition,\n  HierarchyDefinitionParentNode,\n  HierarchyLevelDefinition,\n  HierarchyNodesDefinition,\n  InstanceNodesQueryDefinition,\n  NodeParser,\n  NodePostProcessor,\n  NodePreProcessor,\n} from \"./IModelHierarchyDefinition.js\";\nimport { ProcessedGroupingHierarchyNode, ProcessedHierarchyNode, SourceHierarchyNode, SourceInstanceHierarchyNode } from \"./IModelHierarchyNode.js\";\nimport { defaultNodesParser } from \"./TreeNodesReader.js\";\n\ninterface FilteringHierarchyDefinitionProps {\n  imodelAccess: ECClassHierarchyInspector & { imodelKey: string };\n  source: HierarchyDefinition;\n  nodeIdentifierPaths: HierarchyFilteringPath[];\n}\n\n/** @internal */\nexport class FilteringHierarchyDefinition implements HierarchyDefinition {\n  private _imodelAccess: ECClassHierarchyInspector & { imodelKey: string };\n  private _source: HierarchyDefinition;\n  private _nodeIdentifierPaths: HierarchyFilteringPath[];\n\n  public constructor(props: FilteringHierarchyDefinitionProps) {\n    this._imodelAccess = props.imodelAccess;\n    this._source = props.source;\n    this._nodeIdentifierPaths = props.nodeIdentifierPaths;\n  }\n\n  public get preProcessNode(): NodePreProcessor {\n    return async (node) => {\n      const processedNode = this._source.preProcessNode ? await this._source.preProcessNode(node) : node;\n      if (processedNode?.processingParams?.hideInHierarchy && processedNode.filtering?.isFilterTarget && !processedNode.filtering.hasFilterTargetAncestor) {\n        // we want to hide target nodes if they have `hideInHierarchy` param, but only if they're not under another filter target\n        return undefined;\n      }\n      return processedNode;\n    };\n  }\n\n  private shouldExpandGroupingNode(node: ProcessedGroupingHierarchyNode) {\n    for (const child of node.children) {\n      /* c8 ignore next 3 */\n      if (!child.filtering) {\n        continue;\n      }\n\n      if (child.filtering.isFilterTarget) {\n        const childAutoExpand = child.filtering.filterTargetOptions?.autoExpand;\n\n        // If child is a filter target and is has no `autoExpand` flag, then it's always to be expanded.\n        if (childAutoExpand === true) {\n          return true;\n        }\n\n        // If it's not an object and not `true`, then it's falsy - continue looking\n        if (typeof childAutoExpand !== \"object\") {\n          continue;\n        }\n\n        // If grouping node's child has `autoExpandUntil` flag,\n        // auto-expand the grouping node only if it's depth is lower than that of the grouping node in associated with the target.\n        const nodeDepth = node.parentKeys.length;\n        const filterTargetDepth = childAutoExpand.depth;\n        if (nodeDepth < filterTargetDepth) {\n          return true;\n        }\n      }\n\n      if (!child.filtering.filteredChildrenIdentifierPaths) {\n        /* c8 ignore next */\n        continue;\n      }\n\n      for (const path of child.filtering.filteredChildrenIdentifierPaths) {\n        if (\"path\" in path && path.options?.autoExpand) {\n          return true;\n        }\n      }\n    }\n    return false;\n  }\n\n  public get postProcessNode(): NodePostProcessor {\n    return async (node: ProcessedHierarchyNode) => {\n      const processedNode = this._source.postProcessNode ? await this._source.postProcessNode(node) : node;\n      // instance nodes get the auto-expand flag in `parseNode`, but grouping ones need to be handled during post-processing\n      if (ProcessedHierarchyNode.isGroupingNode(node) && this.shouldExpandGroupingNode(node)) {\n        Object.assign(processedNode, { autoExpand: true });\n      }\n      return processedNode;\n    };\n  }\n\n  public get parseNode(): NodeParser {\n    return async (row: { [columnName: string]: any }, parentNode?: HierarchyDefinitionParentNode): Promise<SourceInstanceHierarchyNode> => {\n      const hasFilterTargetAncestor: boolean = !!row[ECSQL_COLUMN_NAME_HasFilterTargetAncestor];\n\n      const { filteredChildrenIdentifierPaths, filterTargetOptions, isFilterTarget } =\n        row[ECSQL_COLUMN_NAME_FilterECInstanceId] && row[ECSQL_COLUMN_NAME_FilterClassName]\n          ? await this.getChildrenIdentifierPaths(parentNode?.filtering?.filteredChildrenIdentifierPaths ?? this._nodeIdentifierPaths, {\n              className: row[ECSQL_COLUMN_NAME_FilterClassName],\n              id: row[ECSQL_COLUMN_NAME_FilterECInstanceId],\n            })\n          : { filteredChildrenIdentifierPaths: [], filterTargetOptions: undefined, isFilterTarget: false };\n\n      const defaultNode = await (this._source.parseNode ?? defaultNodesParser)(row);\n      return applyFilterAttributes({\n        node: defaultNode,\n        filteredChildrenIdentifierPaths,\n        isFilterTarget,\n        filterTargetOptions,\n        hasFilterTargetAncestor,\n      });\n    };\n  }\n\n  private async getChildrenIdentifierPaths(filteredChildrenNodeIdentifierPaths: HierarchyFilteringPath[], providedIdentifier: InstanceKey) {\n    const { id, className } = providedIdentifier;\n\n    let filteredChildrenIdentifierPaths: HierarchyFilteringPath[] | undefined;\n    let isFilterTarget = false;\n    let filterTargetOptions: HierarchyFilteringPathOptions | undefined;\n    for (const filteredChildrenNodeIdentifierPath of filteredChildrenNodeIdentifierPaths) {\n      const { path, options } = HierarchyFilteringPath.normalize(filteredChildrenNodeIdentifierPath);\n      /* c8 ignore next 3 */\n      if (path.length === 0) {\n        continue;\n      }\n\n      // We need to check if identifiers have the same id and imodelKey and are\n      // of the same class / derived class / is derived from class\n      const identifier = path[0];\n      if (identifier.id !== id) {\n        continue;\n      }\n      if (HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n        if (identifier.imodelKey && identifier.imodelKey !== this._imodelAccess.imodelKey) {\n          continue;\n        }\n        if (\n          identifier.className !== className &&\n          !(await this._imodelAccess.classDerivesFrom(identifier.className, className)) &&\n          !(await this._imodelAccess.classDerivesFrom(className, identifier.className))\n        ) {\n          continue;\n        }\n      }\n      if (!filteredChildrenIdentifierPaths) {\n        filteredChildrenIdentifierPaths = [];\n      }\n      if (path.length > 1) {\n        filteredChildrenIdentifierPaths.push(options ? { path: path.slice(1), options } : path.slice(1));\n      } else if (isFilterTarget) {\n        filterTargetOptions = HierarchyFilteringPath.mergeOptions(filterTargetOptions, options);\n      } else {\n        isFilterTarget = true;\n        filterTargetOptions = options;\n      }\n    }\n    return { filteredChildrenIdentifierPaths, filterTargetOptions, isFilterTarget };\n  }\n\n  public async defineHierarchyLevel(props: DefineHierarchyLevelProps): Promise<HierarchyLevelDefinition> {\n    const sourceDefinitions = await this._source.defineHierarchyLevel(props);\n    const filteringProps = extractFilteringProps(this._nodeIdentifierPaths, props.parentNode);\n    if (!filteringProps) {\n      return sourceDefinitions;\n    }\n\n    const filteredDefinitions: HierarchyLevelDefinition = [];\n    await Promise.all(\n      sourceDefinitions.map(async (definition) => {\n        let matchedDefinition: HierarchyNodesDefinition | undefined;\n        if (HierarchyNodesDefinition.isGenericNode(definition)) {\n          matchedDefinition = await matchFilters<GenericNodeKey>(\n            definition,\n            filteringProps,\n            async (id) => {\n              return (\n                HierarchyNodeIdentifier.isGenericNodeIdentifier(id) &&\n                (!id.source || id.source === this._imodelAccess.imodelKey) &&\n                id.id === definition.node.key\n              );\n            },\n            this._imodelAccess,\n            (def, matchingFilters) => {\n              const filteredChildrenIdentifierPaths = matchingFilters.reduce(\n                (r, c) => [...r, ...c.childrenIdentifierPaths],\n                new Array<HierarchyFilteringPath>(),\n              );\n              return {\n                ...def,\n                node: applyFilterAttributes({\n                  node: def.node,\n                  filteredChildrenIdentifierPaths,\n                  isFilterTarget: matchingFilters.some((mc) => mc.isFilterTarget),\n                  filterTargetOptions: matchingFilters.find((mc) => mc.isFilterTarget)?.filterTargetOptions,\n                  hasFilterTargetAncestor: filteringProps.hasFilterTargetAncestor,\n                }),\n              };\n            },\n          );\n        } else {\n          matchedDefinition = await matchFilters<InstanceKey>(\n            definition,\n            filteringProps,\n            async (id) => {\n              return (\n                HierarchyNodeIdentifier.isInstanceNodeIdentifier(id) &&\n                (!id.imodelKey || id.imodelKey === this._imodelAccess.imodelKey) &&\n                (await this._imodelAccess.classDerivesFrom(id.className, definition.fullClassName))\n              );\n            },\n            this._imodelAccess,\n            (def, matchingFilters) => applyECInstanceIdsFilter(def, matchingFilters, !!filteringProps.hasFilterTargetAncestor),\n            false,\n          );\n        }\n        if (matchedDefinition) {\n          filteredDefinitions.push(matchedDefinition);\n        }\n      }),\n    );\n    return filteredDefinitions;\n  }\n}\n\ntype MatchedFilter<TIdentifier extends HierarchyNodeIdentifier> = {\n  id: TIdentifier;\n  childrenIdentifierPaths: HierarchyFilteringPath[];\n} & ({ isFilterTarget: false } | { isFilterTarget: true; filterTargetOptions?: HierarchyFilteringPathOptions });\n\nasync function matchFilters<\n  TIdentifier extends HierarchyNodeIdentifier,\n  TDefinition = TIdentifier extends InstanceKey ? InstanceNodesQueryDefinition : GenericHierarchyNodeDefinition,\n>(\n  definition: TDefinition,\n  filteringProps: { filteredNodePaths: HierarchyFilteringPath[]; hasFilterTargetAncestor?: boolean },\n  predicate: (id: HierarchyNodeIdentifier) => Promise<boolean>,\n  classHierarchy: ECClassHierarchyInspector,\n  matchedDefinitionProcessor: (def: TDefinition, matchingFilters: Array<MatchedFilter<TIdentifier>>) => TDefinition,\n  extractPathsAndOptions: boolean = true,\n): Promise<TDefinition | undefined> {\n  const { filteredNodePaths, hasFilterTargetAncestor } = filteringProps;\n  const matchingFilters: Array<MatchedFilter<TIdentifier>> = [];\n  for (const filteredNodePath of filteredNodePaths) {\n    const { path, options } = HierarchyFilteringPath.normalize(filteredNodePath);\n    if (path.length === 0) {\n      continue;\n    }\n    const nodeId = path[0];\n    if (await predicate(nodeId)) {\n      let entry = await findMatchingFilterEntry(matchingFilters, nodeId, classHierarchy);\n      if (!entry) {\n        entry = {\n          // ideally, `predicate` would act as a type guard to guarantee that `id` is `TIdentifier`, but at the moment\n          // async type guards aren't supported\n          id: nodeId as TIdentifier,\n          childrenIdentifierPaths: [],\n          isFilterTarget: false,\n        };\n        matchingFilters.push(entry);\n      }\n\n      if (!extractPathsAndOptions) {\n        continue;\n      }\n\n      if (path.length > 1) {\n        entry.childrenIdentifierPaths.push(options ? { path: path.slice(1), options } : path.slice(1));\n      } else if (entry.isFilterTarget) {\n        entry.filterTargetOptions = HierarchyFilteringPath.mergeOptions(entry.filterTargetOptions, options);\n      } else {\n        Object.assign(entry, { isFilterTarget: true, filterTargetOptions: options });\n      }\n    }\n  }\n  if (hasFilterTargetAncestor || matchingFilters.length > 0) {\n    return matchedDefinitionProcessor(definition, matchingFilters);\n  }\n  return undefined;\n}\n\nasync function findMatchingFilterEntry<TEntry extends { id: TIdentifier }, TIdentifier extends HierarchyNodeIdentifier>(\n  filters: TEntry[],\n  nodeId: TIdentifier,\n  classHierarchy: ECClassHierarchyInspector,\n): Promise<TEntry | undefined> {\n  for (const filter of filters) {\n    if (await identifiersEqual(filter.id, nodeId, classHierarchy)) {\n      return filter;\n    }\n  }\n  return undefined;\n}\n\nasync function identifiersEqual<TIdentifier extends HierarchyNodeIdentifier>(lhs: TIdentifier, rhs: TIdentifier, classHierarchy: ECClassHierarchyInspector) {\n  if (HierarchyNodeIdentifier.isInstanceNodeIdentifier(lhs) && HierarchyNodeIdentifier.isInstanceNodeIdentifier(rhs)) {\n    return (\n      lhs.id === rhs.id &&\n      (lhs.className === rhs.className ||\n        (await classHierarchy.classDerivesFrom(lhs.className, rhs.className)) ||\n        (await classHierarchy.classDerivesFrom(rhs.className, lhs.className)))\n    );\n  }\n  return HierarchyNodeIdentifier.equal(lhs, rhs);\n}\n\nfunction applyFilterAttributes<TNode extends SourceHierarchyNode>(props: {\n  node: TNode;\n  filteredChildrenIdentifierPaths: HierarchyFilteringPath[] | undefined;\n  isFilterTarget?: boolean;\n  filterTargetOptions?: HierarchyFilteringPathOptions;\n  hasFilterTargetAncestor: boolean;\n}): TNode {\n  const { node, filteredChildrenIdentifierPaths } = props;\n  const result = { ...node };\n\n  const shouldAutoExpand = !!filteredChildrenIdentifierPaths?.some((childPath) => {\n    return !!HierarchyFilteringPath.normalize(childPath).options?.autoExpand;\n  });\n  if (shouldAutoExpand) {\n    result.autoExpand = true;\n  }\n\n  const filteringProps = HierarchyNodeFilteringProps.create(props);\n  if (filteringProps) {\n    result.filtering = filteringProps;\n  }\n\n  return result;\n}\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_HasFilterTargetAncestor = \"HasFilterTargetAncestor\";\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_FilterECInstanceId = \"FilterECInstanceId\";\n\n/** @internal */\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const ECSQL_COLUMN_NAME_FilterClassName = \"FilterClassName\";\n\nfunction getClassECInstanceIds(matchingFilters: Array<{ id: InstanceKey }>) {\n  const classNameECInstanceIds = new Map<string, Id64String[]>();\n  for (const matchingFilter of matchingFilters) {\n    const entry = classNameECInstanceIds.get(matchingFilter.id.className);\n    if (entry === undefined) {\n      classNameECInstanceIds.set(matchingFilter.id.className, [matchingFilter.id.id]);\n      continue;\n    }\n    entry.push(matchingFilter.id.id);\n  }\n  return classNameECInstanceIds;\n}\n\n/** @internal */\nexport function applyECInstanceIdsFilter(\n  def: InstanceNodesQueryDefinition,\n  matchingFilters: Array<{ id: InstanceKey }>,\n  hasFilterTargetAncestor: boolean,\n): InstanceNodesQueryDefinition {\n  if (matchingFilters.length === 0) {\n    return def;\n  }\n  const matchingFiltersToUse = getClassECInstanceIds(matchingFilters);\n  return {\n    ...def,\n    query: {\n      ...def.query,\n      ctes: [\n        ...(def.query.ctes ?? []),\n        `FilteringInfo(ECInstanceId, FilterClassName) AS (\n          ${Array.from(matchingFiltersToUse)\n            .map(\n              ([className, ecInstanceIds]) => `\n                SELECT ECInstanceId, '${className}' AS FilterClassName\n                FROM ${className}\n                WHERE ECInstanceId IN (${ecInstanceIds.join(\", \")})\n              `,\n            )\n            .join(\" UNION ALL \")}\n        )`,\n      ],\n      ecsql: `\n        SELECT\n          [q].*,\n          ${hasFilterTargetAncestor ? \"1\" : \"0\"} AS [${ECSQL_COLUMN_NAME_HasFilterTargetAncestor}],\n          IdToHex([f].[ECInstanceId]) AS [${ECSQL_COLUMN_NAME_FilterECInstanceId}],\n          [f].[FilterClassName] AS [${ECSQL_COLUMN_NAME_FilterClassName}]\n        FROM (\n          ${def.query.ecsql}\n        ) [q]\n        ${hasFilterTargetAncestor ? \"LEFT \" : \"\"} JOIN FilteringInfo [f] ON [f].[ECInstanceId] = [q].[ECInstanceId]\n      `,\n    },\n  };\n}\n"]}

package/lib/cjs/hierarchies/imodel/HierarchyCache.d.ts

@@ -1,4 +1,4 @@
-import { GetHierarchyNodesProps } from "../HierarchyProvider";
+import { GetHierarchyNodesProps } from "../HierarchyProvider.js";
 interface ChildNodeObservablesCacheProps {
     size: number;
     variationsCount?: number;

package/lib/cjs/hierarchies/imodel/HierarchyCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchyCache.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/HierarchyCache.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAS9D,UAAU,8BAA8B;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,gBAAgB;AAChB,qBAAa,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,CAA4D;IACxE,OAAO,CAAC,MAAM,CAAiC;gBAE5B,KAAK,EAAE,8BAA8B;IAKxD,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,iBAAiB;IAyBlB,GAAG,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC;IAKlD,GAAG,CAAC,YAAY,EAAE,sBAAsB,GAAG,CAAC,GAAG,SAAS;IAKxD,KAAK;CAGb"}
+{"version":3,"file":"HierarchyCache.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/HierarchyCache.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AASjE,UAAU,8BAA8B;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,gBAAgB;AAChB,qBAAa,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,CAA4D;IACxE,OAAO,CAAC,MAAM,CAAiC;gBAE5B,KAAK,EAAE,8BAA8B;IAKxD,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,iBAAiB;IAyBlB,GAAG,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,EAAE,CAAC;IAKlD,GAAG,CAAC,YAAY,EAAE,sBAAsB,GAAG,CAAC,GAAG,SAAS;IAKxD,KAAK;CAGb"}

package/lib/cjs/hierarchies/imodel/HierarchyCache.js

@@ -6,7 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HierarchyCache = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
-const HierarchyNodeKey_1 = require("../HierarchyNodeKey");
+const HierarchyNodeKey_js_1 = require("../HierarchyNodeKey.js");
 /** @internal */
 class HierarchyCache {
     _map;
@@ -74,7 +74,7 @@ function compareHierarchyNodeKeys(lhs, rhs) {
         return lhs.length - rhs.length;
     }
     for (let i = 0; i < lhs.length; ++i) {
-        const keysCompareResult = HierarchyNodeKey_1.HierarchyNodeKey.compare(lhs[i], rhs[i]);
+        const keysCompareResult = HierarchyNodeKey_js_1.HierarchyNodeKey.compare(lhs[i], rhs[i]);
         if (keysCompareResult !== 0) {
             return keysCompareResult;
         }

package/lib/cjs/hierarchies/imodel/HierarchyCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchyCache.js","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/HierarchyCache.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 { LRUCache, LRUDictionary, LRUMap } from \"@itwin/core-bentley\";\nimport { InstanceKey } from \"@itwin/presentation-shared\";\nimport { HierarchyNodeKey } from \"../HierarchyNodeKey\";\nimport { GetHierarchyNodesProps } from \"../HierarchyProvider\";\n\ninterface HierarchyCacheEntry<T> {\n  /** Stores observables for the default case - no instance filter or custom limit for the hierarchy level. */\n  primary: T | undefined;\n  /** Stores a limited number of variations with custom instance filter and/or custom limit for the hierarchy level. */\n  variations: LRUCache<string, T>;\n}\n\ninterface ChildNodeObservablesCacheProps {\n  size: number;\n  variationsCount?: number;\n}\n\n/** @internal */\nexport class HierarchyCache<T> {\n  private _map: LRUDictionary<HierarchyNodeKey[], HierarchyCacheEntry<T>>;\n  private _props: ChildNodeObservablesCacheProps;\n\n  public constructor(props: ChildNodeObservablesCacheProps) {\n    this._props = props;\n    this._map = new LRUDictionary<HierarchyNodeKey[], HierarchyCacheEntry<T>>(props.size, compareHierarchyNodeKeys);\n  }\n\n  private createCacheKeys(\n    props: Omit<GetHierarchyNodesProps, \"parentNode\"> & {\n      parentNode: { key: HierarchyNodeKey; parentKeys: HierarchyNodeKey[] } | undefined;\n      filteredInstanceKeys?: InstanceKey[];\n    },\n  ) {\n    function createVariationKey() {\n      const { instanceFilter, hierarchyLevelSizeLimit, filteredInstanceKeys } = props;\n      if (instanceFilter === undefined && hierarchyLevelSizeLimit === undefined && filteredInstanceKeys === undefined) {\n        return undefined;\n      }\n      return JSON.stringify({ instanceFilter, hierarchyLevelSizeLimit, filteredInstanceKeys });\n    }\n\n    if (!props.parentNode) {\n      return { primaryKey: [], variationKey: createVariationKey() };\n    }\n\n    const parentKeys = props.parentNode.parentKeys;\n\n    return {\n      primaryKey: [...parentKeys, props.parentNode.key],\n      variationKey: createVariationKey(),\n    };\n  }\n\n  private getCacheAccessors(primaryKey: HierarchyNodeKey[], variationKey?: string) {\n    const getMapEntry = (create: boolean) => {\n      let entry = this._map.get(primaryKey);\n      if (!entry && create) {\n        entry = { primary: undefined, variations: new LRUMap(this._props.variationsCount ?? 1) };\n        this._map.set(primaryKey, entry);\n      }\n      return entry;\n    };\n    if (variationKey) {\n      return {\n        get: () => getMapEntry(false)?.variations.get(variationKey),\n        set: (value: T) => {\n          getMapEntry(true)!.variations.set(variationKey, value);\n        },\n      };\n    }\n    return {\n      get: () => getMapEntry(false)?.primary,\n      set: (value: T) => {\n        getMapEntry(true)!.primary = value;\n      },\n    };\n  }\n\n  public set(requestProps: GetHierarchyNodesProps, value: T) {\n    const { primaryKey, variationKey } = this.createCacheKeys(requestProps);\n    this.getCacheAccessors(primaryKey, variationKey).set(value);\n  }\n\n  public get(requestProps: GetHierarchyNodesProps): T | undefined {\n    const { primaryKey, variationKey } = this.createCacheKeys(requestProps);\n    return this.getCacheAccessors(primaryKey, variationKey).get();\n  }\n\n  public clear() {\n    this._map.clear();\n  }\n}\n\nfunction compareHierarchyNodeKeys(lhs: HierarchyNodeKey[], rhs: HierarchyNodeKey[]) {\n  if (lhs.length !== rhs.length) {\n    return lhs.length - rhs.length;\n  }\n  for (let i = 0; i < lhs.length; ++i) {\n    const keysCompareResult = HierarchyNodeKey.compare(lhs[i], rhs[i]);\n    if (keysCompareResult !== 0) {\n      return keysCompareResult;\n    }\n  }\n  return 0;\n}\n"]}
+{"version":3,"file":"HierarchyCache.js","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/HierarchyCache.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 { LRUCache, LRUDictionary, LRUMap } from \"@itwin/core-bentley\";\nimport { InstanceKey } from \"@itwin/presentation-shared\";\nimport { HierarchyNodeKey } from \"../HierarchyNodeKey.js\";\nimport { GetHierarchyNodesProps } from \"../HierarchyProvider.js\";\n\ninterface HierarchyCacheEntry<T> {\n  /** Stores observables for the default case - no instance filter or custom limit for the hierarchy level. */\n  primary: T | undefined;\n  /** Stores a limited number of variations with custom instance filter and/or custom limit for the hierarchy level. */\n  variations: LRUCache<string, T>;\n}\n\ninterface ChildNodeObservablesCacheProps {\n  size: number;\n  variationsCount?: number;\n}\n\n/** @internal */\nexport class HierarchyCache<T> {\n  private _map: LRUDictionary<HierarchyNodeKey[], HierarchyCacheEntry<T>>;\n  private _props: ChildNodeObservablesCacheProps;\n\n  public constructor(props: ChildNodeObservablesCacheProps) {\n    this._props = props;\n    this._map = new LRUDictionary<HierarchyNodeKey[], HierarchyCacheEntry<T>>(props.size, compareHierarchyNodeKeys);\n  }\n\n  private createCacheKeys(\n    props: Omit<GetHierarchyNodesProps, \"parentNode\"> & {\n      parentNode: { key: HierarchyNodeKey; parentKeys: HierarchyNodeKey[] } | undefined;\n      filteredInstanceKeys?: InstanceKey[];\n    },\n  ) {\n    function createVariationKey() {\n      const { instanceFilter, hierarchyLevelSizeLimit, filteredInstanceKeys } = props;\n      if (instanceFilter === undefined && hierarchyLevelSizeLimit === undefined && filteredInstanceKeys === undefined) {\n        return undefined;\n      }\n      return JSON.stringify({ instanceFilter, hierarchyLevelSizeLimit, filteredInstanceKeys });\n    }\n\n    if (!props.parentNode) {\n      return { primaryKey: [], variationKey: createVariationKey() };\n    }\n\n    const parentKeys = props.parentNode.parentKeys;\n\n    return {\n      primaryKey: [...parentKeys, props.parentNode.key],\n      variationKey: createVariationKey(),\n    };\n  }\n\n  private getCacheAccessors(primaryKey: HierarchyNodeKey[], variationKey?: string) {\n    const getMapEntry = (create: boolean) => {\n      let entry = this._map.get(primaryKey);\n      if (!entry && create) {\n        entry = { primary: undefined, variations: new LRUMap(this._props.variationsCount ?? 1) };\n        this._map.set(primaryKey, entry);\n      }\n      return entry;\n    };\n    if (variationKey) {\n      return {\n        get: () => getMapEntry(false)?.variations.get(variationKey),\n        set: (value: T) => {\n          getMapEntry(true)!.variations.set(variationKey, value);\n        },\n      };\n    }\n    return {\n      get: () => getMapEntry(false)?.primary,\n      set: (value: T) => {\n        getMapEntry(true)!.primary = value;\n      },\n    };\n  }\n\n  public set(requestProps: GetHierarchyNodesProps, value: T) {\n    const { primaryKey, variationKey } = this.createCacheKeys(requestProps);\n    this.getCacheAccessors(primaryKey, variationKey).set(value);\n  }\n\n  public get(requestProps: GetHierarchyNodesProps): T | undefined {\n    const { primaryKey, variationKey } = this.createCacheKeys(requestProps);\n    return this.getCacheAccessors(primaryKey, variationKey).get();\n  }\n\n  public clear() {\n    this._map.clear();\n  }\n}\n\nfunction compareHierarchyNodeKeys(lhs: HierarchyNodeKey[], rhs: HierarchyNodeKey[]) {\n  if (lhs.length !== rhs.length) {\n    return lhs.length - rhs.length;\n  }\n  for (let i = 0; i < lhs.length; ++i) {\n    const keysCompareResult = HierarchyNodeKey.compare(lhs[i], rhs[i]);\n    if (keysCompareResult !== 0) {\n      return keysCompareResult;\n    }\n  }\n  return 0;\n}\n"]}

package/lib/cjs/hierarchies/imodel/IModelHierarchyDefinition.d.ts

@@ -1,10 +1,10 @@
 import { GenericInstanceFilter } from "@itwin/core-common";
 import { ECSqlQueryDef } from "@itwin/presentation-shared";
-import { NonGroupingHierarchyNode } from "../HierarchyNode";
-import { ProcessedGenericHierarchyNode, ProcessedHierarchyNode, ProcessedInstanceHierarchyNode, SourceGenericHierarchyNode, SourceInstanceHierarchyNode } from "./IModelHierarchyNode";
+import { NonGroupingHierarchyNode } from "../HierarchyNode.js";
+import { ProcessedGenericHierarchyNode, ProcessedHierarchyNode, ProcessedInstanceHierarchyNode, SourceGenericHierarchyNode, SourceInstanceHierarchyNode } from "./IModelHierarchyNode.js";
 /**
  * A nodes definition that returns a single generic node.
- * @beta
+ * @public
  */
 export interface GenericHierarchyNodeDefinition {
     /** The node to be created in the hierarchy level */
@@ -12,7 +12,7 @@ export interface GenericHierarchyNodeDefinition {
 }
 /**
  * A nodes definition that returns an ECSQL query for selecting nodes from an iModel.
- * @beta
+ * @public
  */
 export interface InstanceNodesQueryDefinition {
     /**
@@ -29,39 +29,39 @@ export interface InstanceNodesQueryDefinition {
 }
 /**
  * A definition of nodes included in a hierarchy level.
- * @beta
+ * @public
  */
 export type HierarchyNodesDefinition = GenericHierarchyNodeDefinition | InstanceNodesQueryDefinition;
-/** @beta */
+/** @public */
 export declare namespace HierarchyNodesDefinition {
     function isGenericNode(def: HierarchyNodesDefinition): def is GenericHierarchyNodeDefinition;
     function isInstanceNodesQuery(def: HierarchyNodesDefinition): def is InstanceNodesQueryDefinition;
 }
 /**
  * A definition of a hierarchy level, which may consist of multiple node definitions.
- * @beta
+ * @public
  */
 export type HierarchyLevelDefinition = HierarchyNodesDefinition[];
 /**
  * A type for a function that parses a `SourceInstanceHierarchyNode` from provided ECSQL `row` object.
- * @beta
+ * @public
  */
 export type NodeParser = (row: {
     [columnName: string]: any;
-}) => SourceInstanceHierarchyNode;
+}, parentNode?: HierarchyDefinitionParentNode) => SourceInstanceHierarchyNode | Promise<SourceInstanceHierarchyNode>;
 /**
  * A type for a function that pre-processes given node. Unless the function decides not to make any modifications,
  * it should return a new - modified - node, rather than modifying the given one. Returning `undefined` omits the node
  * from the hierarchy.
  *
- * @beta
+ * @public
  */
 export type NodePreProcessor = <TNode extends ProcessedGenericHierarchyNode | ProcessedInstanceHierarchyNode>(node: TNode) => Promise<TNode | undefined>;
 /**
  * A type for a function that post-processes given node. Unless the function decides not to make any modifications,
  * it should return a new - modified - node, rather than modifying the given one.
  *
- * @beta
+ * @public
  */
 export type NodePostProcessor = (node: ProcessedHierarchyNode) => Promise<ProcessedHierarchyNode>;
 /**
@@ -69,12 +69,12 @@ export type NodePostProcessor = (node: ProcessedHierarchyNode) => Promise<Proces
  * a `HierarchyNode` that:
  * - knows nothing about its children,
  * - is either an instances node (key is of `InstancesNodeKey` type) or a generic node (key is of `GenericNodeKey` type).
- * @beta
+ * @public
  */
 export type HierarchyDefinitionParentNode = Omit<NonGroupingHierarchyNode, "children">;
 /**
  * Props for `HierarchyDefinition.defineHierarchyLevel`.
- * @beta
+ * @public
  */
 export interface DefineHierarchyLevelProps {
     /** Parent node to get children for. Pass `undefined` to get root nodes. */
@@ -84,7 +84,7 @@ export interface DefineHierarchyLevelProps {
 }
 /**
  * An interface for a factory that knows how define a hierarchy based on a given parent node.
- * @beta
+ * @public
  */
 export interface HierarchyDefinition {
     /**

package/lib/cjs/hierarchies/imodel/IModelHierarchyDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IModelHierarchyDefinition.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/IModelHierarchyDefinition.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,8BAA8B,EAC9B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,oDAAoD;IACpD,IAAI,EAAE,0BAA0B,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,KAAK,EAAE,aAAa,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,GAAG,4BAA4B,CAAC;AACrG,YAAY;AAEZ,yBAAiB,wBAAwB,CAAC;IACxC,SAAgB,aAAa,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,IAAI,8BAA8B,CAElG;IACD,SAAgB,oBAAoB,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,IAAI,4BAA4B,CAEvG;CACF;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,wBAAwB,EAAE,CAAC;AAElE;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KAAK,2BAA2B,CAAC;AAE7F;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,SAAS,6BAA6B,GAAG,8BAA8B,EAAE,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;AAEzJ;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAElG;;;;;;GAMG;AACH,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,2EAA2E;IAC3E,UAAU,EAAE,6BAA6B,GAAG,SAAS,CAAC;IAEtD,uCAAuC;IACvC,cAAc,CAAC,EAAE,qBAAqB,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;OASG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IAEvB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAElC;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,iBAAiB,CAAC;IAEpC,+EAA+E;IAC/E,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAC3F"}
+{"version":3,"file":"IModelHierarchyDefinition.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/IModelHierarchyDefinition.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,8BAA8B,EAC9B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAElC;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C,oDAAoD;IACpD,IAAI,EAAE,0BAA0B,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,KAAK,EAAE,aAAa,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,8BAA8B,GAAG,4BAA4B,CAAC;AACrG,cAAc;AAEd,yBAAiB,wBAAwB,CAAC;IACxC,SAAgB,aAAa,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,IAAI,8BAA8B,CAElG;IACD,SAAgB,oBAAoB,CAAC,GAAG,EAAE,wBAAwB,GAAG,GAAG,IAAI,4BAA4B,CAEvG;CACF;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,wBAAwB,EAAE,CAAC;AAElE;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE;IAAE,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAClC,UAAU,CAAC,EAAE,6BAA6B,KACvC,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAExE;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,SAAS,6BAA6B,GAAG,8BAA8B,EAAE,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;AAEzJ;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,sBAAsB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAElG;;;;;;GAMG;AACH,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,2EAA2E;IAC3E,UAAU,EAAE,6BAA6B,GAAG,SAAS,CAAC;IAEtD,uCAAuC;IACvC,cAAc,CAAC,EAAE,qBAAqB,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;OASG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IAEvB;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,gBAAgB,CAAC;IAElC;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,iBAAiB,CAAC;IAEpC,+EAA+E;IAC/E,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CAC3F"}

package/lib/cjs/hierarchies/imodel/IModelHierarchyDefinition.js

@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HierarchyNodesDefinition = void 0;
-/** @beta */
+/** @public */
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 var HierarchyNodesDefinition;
 (function (HierarchyNodesDefinition) {