@itwin/presentation-hierarchies 1.2.1 → 1.4.0

package/lib/cjs/hierarchies/HierarchyProvider.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeProviders = mergeProviders;
 const rxjs_1 = require("rxjs");
 const core_bentley_1 = require("@itwin/core-bentley");
+const Common_js_1 = require("./internal/Common.js");
 const EachValueFrom_js_1 = require("./internal/EachValueFrom.js");
 const Sorting_js_1 = require("./internal/operators/Sorting.js");
 /**
@@ -18,6 +19,10 @@ function mergeProviders({ providers }) {
     providers.forEach((p) => {
         p.hierarchyChanged.addListener(() => hierarchyChanged.raiseEvent());
     });
+    const dispose = () => {
+        hierarchyChanged.clear();
+        providers.forEach((p) => (0, Common_js_1.safeDispose)(p));
+    };
     return {
         hierarchyChanged,
         getNodes: (props) => (0, EachValueFrom_js_1.eachValueFrom)((0, rxjs_1.from)(providers).pipe((0, rxjs_1.mergeMap)((provider) => (0, rxjs_1.from)(provider.getNodes(props)).pipe((0, rxjs_1.mergeMap)((node) => {
@@ -31,12 +36,8 @@ function mergeProviders({ providers }) {
         getNodeInstanceKeys: (props) => (0, EachValueFrom_js_1.eachValueFrom)((0, rxjs_1.from)(providers).pipe((0, rxjs_1.mergeMap)((p) => p.getNodeInstanceKeys(props)))),
         setFormatter: (formatter) => providers.forEach((p) => p.setFormatter(formatter)),
         setHierarchyFilter: (props) => providers.forEach((p) => p.setHierarchyFilter(props)),
-        dispose: () => {
-            hierarchyChanged.clear();
-            providers.forEach((p) => {
-                (0, core_bentley_1.isIDisposable)(p) && p.dispose();
-            });
-        },
+        [Symbol.dispose]: dispose,
+        dispose,
     };
 }
 //# sourceMappingURL=HierarchyProvider.js.map

package/lib/cjs/hierarchies/HierarchyProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"HierarchyProvider.js","sourceRoot":"","sources":["../../../src/hierarchies/HierarchyProvider.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AAuFhG,wCA2CC;AAhID,+BAA8D;AAC9D,sDAA6D;AAK7D,kEAA4D;AAC5D,gEAA2E;AA0E3E;;;GAGG;AACH,SAAgB,cAAc,CAAC,EAAE,SAAS,EAAgC;IACxE,MAAM,gBAAgB,GAAG,IAAI,sBAAO,EAAc,CAAC;IACnD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,gBAAgB;QAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,IAAA,gCAAa,EACX,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CAClB,IAAA,eAAQ,EAAC,CAAC,QAAQ,EAAE,EAAE,CACpB,IAAA,WAAI,EAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACjC,IAAA,eAAQ,EAAC,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YACD,+FAA+F;YAC/F,6EAA6E;YAC7E,OAAO,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CACzB,IAAA,aAAM,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,EAC7B,IAAA,eAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EACjD,IAAA,UAAG,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EACf,IAAA,YAAK,EAAC,SAAS,EAAE,KAAK,CAAC,EACvB,IAAA,UAAG,EAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAC3D,CAAC;QACJ,CAAC,CAAC,CACH,CACF,EACD,qCAAwB,CAEzB,CACF;QACH,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,gCAAa,EAAC,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClH,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAChF,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACpF,OAAO,EAAE,GAAG,EAAE;YACZ,gBAAgB,CAAC,KAAK,EAAE,CAAC;YACzB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACtB,IAAA,4BAAa,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,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 { filter, first, from, map, mergeMap, of } from \"rxjs\";\nimport { BeEvent, isIDisposable } from \"@itwin/core-bentley\";\nimport { GenericInstanceFilter } from \"@itwin/core-common\";\nimport { Event, InstanceKey, IPrimitiveValueFormatter } from \"@itwin/presentation-shared\";\nimport { HierarchyFilteringPath } from \"./HierarchyFiltering.js\";\nimport { HierarchyNode, ParentHierarchyNode } from \"./HierarchyNode.js\";\nimport { eachValueFrom } from \"./internal/EachValueFrom.js\";\nimport { sortNodesByLabelOperator } from \"./internal/operators/Sorting.js\";\n\n/**\n * Props for the `HierarchyProvider.getNodes` call.\n * @public\n */\nexport interface GetHierarchyNodesProps {\n  /** Parent node to get children for. Pass `undefined` to get root nodes. */\n  parentNode: ParentHierarchyNode | undefined;\n\n  /** Optional hierarchy level filter. Has no effect if `parentNode` is a `GroupingNode`. */\n  instanceFilter?: GenericInstanceFilter;\n\n  /**\n   * Optional hierarchy level size limit override. This value is passed to `LimitingECSqlQueryExecutor` used\n   * by this provider to override query rows limit per hierarchy level. If not provided, defaults to whatever\n   * is used by the limiting query executor.\n   *\n   * Has no effect if `parentNode` is a `GroupingNode`.\n   */\n  hierarchyLevelSizeLimit?: number | \"unbounded\";\n\n  /** When set to true ignores the cache and fetches the nodes again. */\n  ignoreCache?: boolean;\n}\n\n/**\n * An interface for a hierarchy provider that knows how to create child nodes for a given parent node.\n * @public\n */\nexport interface HierarchyProvider {\n  /**\n   * An event that provider raises when the internal data source changes, resulting in a\n   * hierarchy change.\n   *\n   * Consumers are expected to subscribe to this event and reload the hierarchy when it's raised.\n   */\n  readonly hierarchyChanged: Event<() => void>;\n\n  /** Gets nodes for the specified parent node. */\n  getNodes(props: GetHierarchyNodesProps): AsyncIterableIterator<HierarchyNode>;\n\n  /** Gets instance keys for the specified parent node. */\n  getNodeInstanceKeys(props: Omit<GetHierarchyNodesProps, \"ignoreCache\">): AsyncIterableIterator<InstanceKey>;\n\n  /**\n   * Overrides the property value formatter used by the hierarchy provider. Setting to `undefined`\n   * resets the formatter to the result of `createDefaultValueFormatter` called with default parameters.\n   */\n  setFormatter(formatter: IPrimitiveValueFormatter | undefined): void;\n\n  /**\n   * Sets the hierarchy filter used by this hierarchy provider. Setting to `undefined`\n   * removes the filter.\n   */\n  setHierarchyFilter(\n    props:\n      | {\n          /** A list of node identifiers from root to target node. */\n          paths: HierarchyFilteringPath[];\n        }\n      | undefined,\n  ): void;\n}\n\n/**\n * Props for `mergeProviders` function.\n * @public\n */\ninterface MergeHierarchyProvidersProps {\n  /** List of providers to merge. */\n  providers: HierarchyProvider[];\n}\n\n/**\n * Creates a single, merged, hierarchy provider from multiple given providers.\n * @public\n */\nexport function mergeProviders({ providers }: MergeHierarchyProvidersProps): HierarchyProvider & { dispose: () => void } {\n  const hierarchyChanged = new BeEvent<() => void>();\n  providers.forEach((p) => {\n    p.hierarchyChanged.addListener(() => hierarchyChanged.raiseEvent());\n  });\n\n  return {\n    hierarchyChanged,\n    getNodes: (props) =>\n      eachValueFrom(\n        from(providers).pipe(\n          mergeMap((provider) =>\n            from(provider.getNodes(props)).pipe(\n              mergeMap((node) => {\n                if (node.children) {\n                  return of(node);\n                }\n                // each provider only considers its own data when determining node's children - in case it says\n                // the node has no children, we have to check against the other providers too\n                return from(providers).pipe(\n                  filter((p) => p !== provider),\n                  mergeMap((p) => p.getNodes({ parentNode: node })),\n                  map(() => true),\n                  first(undefined, false),\n                  map((hasChildren) => ({ ...node, children: hasChildren })),\n                );\n              }),\n            ),\n          ),\n          sortNodesByLabelOperator,\n          // TODO: consider merging similar nodes\n        ),\n      ),\n    getNodeInstanceKeys: (props) => eachValueFrom(from(providers).pipe(mergeMap((p) => p.getNodeInstanceKeys(props)))),\n    setFormatter: (formatter) => providers.forEach((p) => p.setFormatter(formatter)),\n    setHierarchyFilter: (props) => providers.forEach((p) => p.setHierarchyFilter(props)),\n    dispose: () => {\n      hierarchyChanged.clear();\n      providers.forEach((p) => {\n        isIDisposable(p) && p.dispose();\n      });\n    },\n  };\n}\n"]}
+{"version":3,"file":"HierarchyProvider.js","sourceRoot":"","sources":["../../../src/hierarchies/HierarchyProvider.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;AA6HhG,wCA+CC;AA1KD,+BAA8D;AAC9D,sDAA8C;AAK9C,oDAAmD;AACnD,kEAA4D;AAC5D,gEAA2E;AA+G3E;;;GAGG;AACH,SAAgB,cAAc,CAAC,EAAE,SAAS,EAAgC;IAKxE,MAAM,gBAAgB,GAAG,IAAI,sBAAO,EAAc,CAAC;IACnD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACzB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,uBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,IAAA,gCAAa,EACX,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CAClB,IAAA,eAAQ,EAAC,CAAC,QAAQ,EAAE,EAAE,CACpB,IAAA,WAAI,EAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACjC,IAAA,eAAQ,EAAC,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;YAClB,CAAC;YACD,+FAA+F;YAC/F,6EAA6E;YAC7E,OAAO,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CACzB,IAAA,aAAM,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,EAC7B,IAAA,eAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EACjD,IAAA,UAAG,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EACf,IAAA,YAAK,EAAC,SAAS,EAAE,KAAK,CAAC,EACvB,IAAA,UAAG,EAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAC3D,CAAC;QACJ,CAAC,CAAC,CACH,CACF,EACD,qCAAwB,CAEzB,CACF;QACH,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,gCAAa,EAAC,IAAA,WAAI,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClH,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAChF,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACpF,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO;QACzB,OAAO;KACR,CAAC;AACJ,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 { filter, first, from, map, mergeMap, of } from \"rxjs\";\nimport { BeEvent } from \"@itwin/core-bentley\";\nimport { GenericInstanceFilter } from \"@itwin/core-common\";\nimport { Event, InstanceKey, IPrimitiveValueFormatter, Props } from \"@itwin/presentation-shared\";\nimport { HierarchyFilteringPath } from \"./HierarchyFiltering.js\";\nimport { HierarchyNode, ParentHierarchyNode } from \"./HierarchyNode.js\";\nimport { safeDispose } from \"./internal/Common.js\";\nimport { eachValueFrom } from \"./internal/EachValueFrom.js\";\nimport { sortNodesByLabelOperator } from \"./internal/operators/Sorting.js\";\n\n/**\n * Props for the `HierarchyProvider.getNodes` call.\n * @public\n */\nexport interface GetHierarchyNodesProps {\n  /** Parent node to get children for. Pass `undefined` to get root nodes. */\n  parentNode: ParentHierarchyNode | undefined;\n\n  /** Optional hierarchy level filter. Has no effect if `parentNode` is a `GroupingNode`. */\n  instanceFilter?: GenericInstanceFilter;\n\n  /**\n   * Optional hierarchy level size limit override. This value is passed to `LimitingECSqlQueryExecutor` used\n   * by this provider to override query rows limit per hierarchy level. If not provided, defaults to whatever\n   * is used by the limiting query executor.\n   *\n   * Has no effect if `parentNode` is a `GroupingNode`.\n   */\n  hierarchyLevelSizeLimit?: number | \"unbounded\";\n\n  /** When set to `true` ignores the cache and fetches the nodes again. */\n  ignoreCache?: boolean;\n}\n\n/**\n * Event arguments for `HierarchyProvider.hierarchyChanged` event.\n * @public\n */\ninterface HierarchyChangedEventArgs {\n  /** Set when the hierarchy change was caused by a formatter change. */\n  formatterChange?: {\n    newFormatter: IPrimitiveValueFormatter | undefined;\n  };\n\n  /** Set when the hierarchy change was caused by a hierarchy filter change. */\n  filterChange?: {\n    newFilter: Props<HierarchyProvider[\"setHierarchyFilter\"]>;\n  };\n}\n\n/**\n * An interface for a hierarchy provider that knows how to create child nodes for a given parent node.\n * @public\n */\nexport interface HierarchyProvider {\n  /**\n   * An event that provider raises due to a hierarchy change, that requires a reload. Provider may\n   * set additional event arguments to provide extra information about what caused the change.\n   *\n   * Consumers are expected to subscribe to this event and reload the hierarchy when it's raised.\n   * Implementations may provide additional details on what caused the change through the optional\n   * event arguments.\n   */\n  readonly hierarchyChanged: Event<(args?: HierarchyChangedEventArgs) => void>;\n\n  /**\n   * Gets nodes for the specified parent node. This is **the method to implement**, otherwise\n   * the provider doesn't return any nodes.\n   */\n  getNodes(props: GetHierarchyNodesProps): AsyncIterableIterator<HierarchyNode>;\n\n  /**\n   * Gets instance keys for the specified parent node.\n   *\n   * The result of this method may be used to determine instances whose nodes would be displayed as children\n   * of the specified parent node. For such use cases calling this method should be more efficient compared\n   * to calling `getNodes`.\n   */\n  getNodeInstanceKeys(props: Omit<GetHierarchyNodesProps, \"ignoreCache\">): AsyncIterableIterator<InstanceKey>;\n\n  /**\n   * Overrides the property value formatter used by the hierarchy provider. Setting to `undefined`\n   * resets the formatter, but what that means depends on the provider implementation - it could just\n   * use unformatted values, or use some default formatter, e.g. the on created by `createDefaultValueFormatter`\n   * from `@itwin/presentation-shared` package.\n   *\n   * @note Changing formatter is expected to trigger the `hierarchyChanged` event with `formatterChange` arg.\n   */\n  setFormatter(formatter: IPrimitiveValueFormatter | undefined): void;\n\n  /**\n   * Sets the hierarchy filter used by this hierarchy provider. Setting to `undefined`\n   * removes the filter.\n   *\n   * @note There's a difference between `undefined` filter and filter with empty paths list. The\n   * former means no filter is applied, while the latter means the filter is applied and it filters-out\n   * all hierarchy.\n   *\n   * @note Changing filter is expected to trigger the `hierarchyChanged` event with `filterChange` arg.\n   */\n  setHierarchyFilter(\n    props:\n      | {\n          /** A list of node identifiers from root to target node. */\n          paths: HierarchyFilteringPath[];\n        }\n      | undefined,\n  ): void;\n}\n\n/**\n * Props for `mergeProviders` function.\n * @public\n */\ninterface MergeHierarchyProvidersProps {\n  /** List of providers to merge. */\n  providers: HierarchyProvider[];\n}\n\n/**\n * Creates a single, merged, hierarchy provider from multiple given providers.\n * @public\n */\nexport function mergeProviders({ providers }: MergeHierarchyProvidersProps): HierarchyProvider & {\n  /** @deprecated in 1.4. Use `[Symbol.dispose]` instead. */\n  dispose: () => void;\n  [Symbol.dispose]: () => void;\n} {\n  const hierarchyChanged = new BeEvent<() => void>();\n  providers.forEach((p) => {\n    p.hierarchyChanged.addListener(() => hierarchyChanged.raiseEvent());\n  });\n  const dispose = () => {\n    hierarchyChanged.clear();\n    providers.forEach((p) => safeDispose(p));\n  };\n\n  return {\n    hierarchyChanged,\n    getNodes: (props) =>\n      eachValueFrom(\n        from(providers).pipe(\n          mergeMap((provider) =>\n            from(provider.getNodes(props)).pipe(\n              mergeMap((node) => {\n                if (node.children) {\n                  return of(node);\n                }\n                // each provider only considers its own data when determining node's children - in case it says\n                // the node has no children, we have to check against the other providers too\n                return from(providers).pipe(\n                  filter((p) => p !== provider),\n                  mergeMap((p) => p.getNodes({ parentNode: node })),\n                  map(() => true),\n                  first(undefined, false),\n                  map((hasChildren) => ({ ...node, children: hasChildren })),\n                );\n              }),\n            ),\n          ),\n          sortNodesByLabelOperator,\n          // TODO: consider merging similar nodes\n        ),\n      ),\n    getNodeInstanceKeys: (props) => eachValueFrom(from(providers).pipe(mergeMap((p) => p.getNodeInstanceKeys(props)))),\n    setFormatter: (formatter) => providers.forEach((p) => p.setFormatter(formatter)),\n    setHierarchyFilter: (props) => providers.forEach((p) => p.setHierarchyFilter(props)),\n    [Symbol.dispose]: dispose,\n    dispose,\n  };\n}\n"]}

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

@@ -18,18 +18,15 @@ export declare class FilteringHierarchyDefinition implements HierarchyDefinition
     private shouldExpandGroupingNode;
     get postProcessNode(): NodePostProcessor;
     get parseNode(): NodeParser;
-    private getChildrenIdentifierPaths;
     defineHierarchyLevel(props: DefineHierarchyLevelProps): Promise<HierarchyLevelDefinition>;
 }
 /** @internal */
-export declare const ECSQL_COLUMN_NAME_HasFilterTargetAncestor = "HasFilterTargetAncestor";
-/** @internal */
 export declare const ECSQL_COLUMN_NAME_FilterECInstanceId = "FilterECInstanceId";
 /** @internal */
 export declare const ECSQL_COLUMN_NAME_FilterClassName = "FilterClassName";
 /** @internal */
-export declare function applyECInstanceIdsFilter(def: InstanceNodesQueryDefinition, matchingFilters: Array<{
-    id: InstanceKey;
-}>, hasFilterTargetAncestor: boolean): InstanceNodesQueryDefinition;
+export declare function applyECInstanceIdsFilter(def: InstanceNodesQueryDefinition, filteredInstanceKeys: InstanceKey[]): InstanceNodesQueryDefinition;
+/** @internal */
+export declare function applyECInstanceIdsSelector(def: InstanceNodesQueryDefinition): InstanceNodesQueryDefinition;
 export {};
 //# sourceMappingURL=FilteringHierarchyDefinition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"FilteringHierarchyDefinition.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/FilteringHierarchyDefinition.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAyB,sBAAsB,EAAiC,MAAM,0BAA0B,CAAC;AAIxH,OAAO,EACL,yBAAyB,EAEzB,mBAAmB,EAEnB,wBAAwB,EAExB,4BAA4B,EAC5B,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAIxC,UAAU,iCAAiC;IACzC,YAAY,EAAE,yBAAyB,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,mBAAmB,EAAE,sBAAsB,EAAE,CAAC;CAC/C;AAED,gBAAgB;AAChB,qBAAa,4BAA6B,YAAW,mBAAmB;IACtE,OAAO,CAAC,aAAa,CAAoD;IACzE,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,oBAAoB,CAA2B;gBAEpC,KAAK,EAAE,iCAAiC;IAM3D,IAAW,cAAc,IAAI,gBAAgB,CAS5C;IAED,OAAO,CAAC,wBAAwB;IA2ChC,IAAW,eAAe,IAAI,iBAAiB,CAS9C;IAED,IAAW,SAAS,IAAI,UAAU,CAqBjC;YAEa,0BAA0B;IA8C3B,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC;CA+DvG;AA4GD,gBAAgB;AAEhB,eAAO,MAAM,yCAAyC,4BAA4B,CAAC;AAEnF,gBAAgB;AAEhB,eAAO,MAAM,oCAAoC,uBAAuB,CAAC;AAEzE,gBAAgB;AAEhB,eAAO,MAAM,iCAAiC,oBAAoB,CAAC;AAenE,gBAAgB;AAChB,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,4BAA4B,EACjC,eAAe,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,EAC3C,uBAAuB,EAAE,OAAO,GAC/B,4BAA4B,CAoC9B"}
+{"version":3,"file":"FilteringHierarchyDefinition.d.ts","sourceRoot":"","sources":["../../../../src/hierarchies/imodel/FilteringHierarchyDefinition.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,yBAAyB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAkC,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAIlG,OAAO,EACL,yBAAyB,EAEzB,mBAAmB,EAEnB,wBAAwB,EAExB,4BAA4B,EAC5B,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AAKxC,UAAU,iCAAiC;IACzC,YAAY,EAAE,yBAAyB,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,MAAM,EAAE,mBAAmB,CAAC;IAC5B,mBAAmB,EAAE,sBAAsB,EAAE,CAAC;CAC/C;AAED,gBAAgB;AAChB,qBAAa,4BAA6B,YAAW,mBAAmB;IACtE,OAAO,CAAC,aAAa,CAAoD;IACzE,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,oBAAoB,CAA2B;gBAEpC,KAAK,EAAE,iCAAiC;IAM3D,IAAW,cAAc,IAAI,gBAAgB,CAS5C;IAED,OAAO,CAAC,wBAAwB;IA2ChC,IAAW,eAAe,IAAI,iBAAiB,CAS9C;IAED,IAAW,SAAS,IAAI,UAAU,CAwCjC;IAEY,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAsGvG;AAED,gBAAgB;AAEhB,eAAO,MAAM,oCAAoC,uBAAuB,CAAC;AAEzE,gBAAgB;AAEhB,eAAO,MAAM,iCAAiC,oBAAoB,CAAC;AAenE,gBAAgB;AAChB,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,4BAA4B,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,4BAA4B,CAgC7I;AAED,gBAAgB;AAChB,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,4BAA4B,GAAG,4BAA4B,CAc1G"}

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

@@ -4,13 +4,16 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ECSQL_COLUMN_NAME_FilterClassName = exports.ECSQL_COLUMN_NAME_FilterECInstanceId = exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = exports.FilteringHierarchyDefinition = void 0;
+exports.ECSQL_COLUMN_NAME_FilterClassName = exports.ECSQL_COLUMN_NAME_FilterECInstanceId = exports.FilteringHierarchyDefinition = void 0;
 exports.applyECInstanceIdsFilter = applyECInstanceIdsFilter;
+exports.applyECInstanceIdsSelector = applyECInstanceIdsSelector;
+const rxjs_1 = require("rxjs");
 const HierarchyFiltering_js_1 = require("../HierarchyFiltering.js");
-const HierarchyNode_js_1 = require("../HierarchyNode.js");
 const HierarchyNodeIdentifier_js_1 = require("../HierarchyNodeIdentifier.js");
+const Partition_js_1 = require("../internal/operators/Partition.js");
 const IModelHierarchyDefinition_js_1 = require("./IModelHierarchyDefinition.js");
 const IModelHierarchyNode_js_1 = require("./IModelHierarchyNode.js");
+const NodeSelectQueryFactory_js_1 = require("./NodeSelectQueryFactory.js");
 const TreeNodesReader_js_1 = require("./TreeNodesReader.js");
 /** @internal */
 class FilteringHierarchyDefinition {
@@ -80,208 +83,143 @@ class FilteringHierarchyDefinition {
     }
     get parseNode() {
         return async (row, parentNode) => {
-            const hasFilterTargetAncestor = !!row[exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor];
-            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,
-                isFilterTarget,
-                filterTargetOptions,
-                hasFilterTargetAncestor,
-            });
-        };
-    }
-    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);
+            const parsedNode = await (this._source.parseNode ?? TreeNodesReader_js_1.defaultNodesParser)(row);
+            const filteringHelper = (0, HierarchyFiltering_js_1.createHierarchyFilteringHelper)(this._nodeIdentifierPaths, parentNode);
+            const nodeExtraProps = row[exports.ECSQL_COLUMN_NAME_FilterECInstanceId] && row[exports.ECSQL_COLUMN_NAME_FilterClassName]
+                ? await (async () => {
+                    const rowInstanceKey = { className: row[exports.ECSQL_COLUMN_NAME_FilterClassName], id: row[exports.ECSQL_COLUMN_NAME_FilterECInstanceId] };
+                    return filteringHelper.createChildNodePropsAsync({
+                        pathMatcher: (identifier) => {
+                            if (identifier.id !== rowInstanceKey.id) {
+                                return false;
+                            }
+                            if (!HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {
+                                return false;
+                            }
+                            if (identifier.imodelKey && identifier.imodelKey !== this._imodelAccess.imodelKey) {
+                                return false;
+                            }
+                            if (identifier.className === rowInstanceKey.className) {
+                                return true;
+                            }
+                            return Promise.all([
+                                this._imodelAccess.classDerivesFrom(identifier.className, rowInstanceKey.className),
+                                this._imodelAccess.classDerivesFrom(rowInstanceKey.className, identifier.className),
+                            ]).then(([isDerivedFrom, isDerivedTo]) => isDerivedFrom || isDerivedTo);
+                        },
+                    });
+                })()
+                : undefined;
+            if (nodeExtraProps?.autoExpand) {
+                parsedNode.autoExpand = true;
             }
-            else {
-                isFilterTarget = true;
-                filterTargetOptions = options;
+            if (nodeExtraProps?.filtering) {
+                parsedNode.filtering = nodeExtraProps.filtering;
             }
-        }
-        return { filteredChildrenIdentifierPaths, filterTargetOptions, isFilterTarget };
+            return parsedNode;
+        };
     }
     async defineHierarchyLevel(props) {
         const sourceDefinitions = await this._source.defineHierarchyLevel(props);
-        const filteringProps = (0, HierarchyFiltering_js_1.extractFilteringProps)(this._nodeIdentifierPaths, props.parentNode);
-        if (!filteringProps) {
+        const filteringHelper = (0, HierarchyFiltering_js_1.createHierarchyFilteringHelper)(this._nodeIdentifierPaths, props.parentNode);
+        const childNodeFilteringIdentifiers = filteringHelper.getChildNodeFilteringIdentifiers();
+        if (!childNodeFilteringIdentifiers) {
             return sourceDefinitions;
         }
-        const filteredDefinitions = [];
-        await Promise.all(sourceDefinitions.map(async (definition) => {
-            let matchedDefinition;
-            if (IModelHierarchyDefinition_js_1.HierarchyNodesDefinition.isGenericNode(definition)) {
-                matchedDefinition = await matchFilters(definition, filteringProps, async (id) => {
-                    return (HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isGenericNodeIdentifier(id) &&
-                        (!id.source || id.source === this._imodelAccess.imodelKey) &&
-                        id.id === definition.node.key);
-                }, this._imodelAccess, (def, matchingFilters) => {
-                    const filteredChildrenIdentifierPaths = matchingFilters.reduce((r, c) => [...r, ...c.childrenIdentifierPaths], new Array());
-                    return {
-                        ...def,
-                        node: applyFilterAttributes({
-                            node: def.node,
-                            filteredChildrenIdentifierPaths,
-                            isFilterTarget: matchingFilters.some((mc) => mc.isFilterTarget),
-                            filterTargetOptions: matchingFilters.find((mc) => mc.isFilterTarget)?.filterTargetOptions,
-                            hasFilterTargetAncestor: filteringProps.hasFilterTargetAncestor,
-                        }),
-                    };
-                });
-            }
-            else {
-                matchedDefinition = await matchFilters(definition, filteringProps, async (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), false);
-            }
-            if (matchedDefinition) {
-                filteredDefinitions.push(matchedDefinition);
-            }
-        }));
-        return filteredDefinitions;
-    }
-}
-exports.FilteringHierarchyDefinition = FilteringHierarchyDefinition;
-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_js_1.HierarchyFilteringPath.normalize(filteredNodePath);
-        if (path.length === 0) {
-            continue;
-        }
-        const nodeId = path[0];
-        if (await predicate(nodeId)) {
-            let entry = await findMatchingFilterEntry(matchingFilters, nodeId, classHierarchy);
-            if (!entry) {
-                entry = {
-                    // ideally, `predicate` would act as a type guard to guarantee that `id` is `TIdentifier`, but at the moment
-                    // async type guards aren't supported
-                    id: nodeId,
-                    childrenIdentifierPaths: [],
-                    isFilterTarget: false,
+        const [genericNodeDefinitions, instanceNodeDefinitions] = (0, Partition_js_1.partition)(sourceDefinitions, IModelHierarchyDefinition_js_1.HierarchyNodesDefinition.isGenericNode);
+        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.merge)(genericNodeDefinitions.pipe((0, rxjs_1.map)((definition) => {
+            if (filteringHelper.hasFilterTargetAncestor ||
+                childNodeFilteringIdentifiers.some((identifier) => HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isGenericNodeIdentifier(identifier) &&
+                    (!identifier.source || identifier.source === this._imodelAccess.imodelKey) &&
+                    identifier.id === definition.node.key)) {
+                return {
+                    ...definition,
+                    node: {
+                        ...definition.node,
+                        ...filteringHelper.createChildNodeProps({ pathMatcher: ({ id }) => id === definition.node.key }),
+                    },
                 };
-                matchingFilters.push(entry);
-            }
-            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_js_1.HierarchyFilteringPath.mergeOptions(entry.filterTargetOptions, options);
             }
-            else {
-                Object.assign(entry, { isFilterTarget: true, filterTargetOptions: options });
+            return undefined;
+        }), (0, rxjs_1.filter)((def) => !!def)), instanceNodeDefinitions.pipe((0, rxjs_1.mergeMap)((definition) => {
+            if (filteringHelper.hasFilterTargetAncestor) {
+                // if we have a filter target ancestor, we don't need to filter the definitions - we use all of them
+                return (0, rxjs_1.of)(applyECInstanceIdsSelector(definition));
             }
-        }
-    }
-    if (hasFilterTargetAncestor || matchingFilters.length > 0) {
-        return matchedDefinitionProcessor(definition, matchingFilters);
-    }
-    return undefined;
-}
-async function findMatchingFilterEntry(filters, nodeId, classHierarchy) {
-    for (const filter of filters) {
-        if (await identifiersEqual(filter.id, nodeId, classHierarchy)) {
-            return filter;
-        }
-    }
-    return undefined;
-}
-async function identifiersEqual(lhs, rhs, classHierarchy) {
-    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_js_1.HierarchyNodeIdentifier.equal(lhs, rhs);
-}
-function applyFilterAttributes(props) {
-    const { node, filteredChildrenIdentifierPaths } = props;
-    const result = { ...node };
-    const shouldAutoExpand = !!filteredChildrenIdentifierPaths?.some((childPath) => {
-        return !!HierarchyFiltering_js_1.HierarchyFilteringPath.normalize(childPath).options?.autoExpand;
-    });
-    if (shouldAutoExpand) {
-        result.autoExpand = true;
-    }
-    const filteringProps = HierarchyNode_js_1.HierarchyNodeFilteringProps.create(props);
-    if (filteringProps) {
-        result.filtering = filteringProps;
+            return (0, rxjs_1.defer)(async () => {
+                const imodelAccess = this._imodelAccess;
+                const matches = new Map();
+                async function getEntries(x) {
+                    let entries = matches.get(x.id);
+                    if (!entries) {
+                        entries = [];
+                        matches.set(x.id, entries);
+                    }
+                    // make sure that we don't have path identifiers that only differ by class name, where
+                    // class names are in the same class hierarchy, e.g.:
+                    // [{ className: "bis.Element", id: "0x1" }, { className: "bis.Subject", id: "0x1" }]
+                    // are actually the same instance, so we only need to keep one of them, or otherwise the query will
+                    // duplicate it
+                    for (const entry of entries) {
+                        if (entry.className === x.className ||
+                            (await imodelAccess.classDerivesFrom(entry.className, x.className)) ||
+                            (await imodelAccess.classDerivesFrom(x.className, entry.className))) {
+                            return undefined;
+                        }
+                    }
+                    return entries;
+                }
+                for (const id of childNodeFilteringIdentifiers) {
+                    // take only identifiers that match the definition by type, source and class
+                    if (!HierarchyNodeIdentifier_js_1.HierarchyNodeIdentifier.isInstanceNodeIdentifier(id)) {
+                        continue;
+                    }
+                    if (id.imodelKey && id.imodelKey !== imodelAccess.imodelKey) {
+                        continue;
+                    }
+                    if (id.className !== definition.fullClassName &&
+                        !(await Promise.all([
+                            imodelAccess.classDerivesFrom(id.className, definition.fullClassName),
+                            imodelAccess.classDerivesFrom(definition.fullClassName, id.className),
+                        ]).then(([isDerivedFrom, isDerivedTo]) => isDerivedFrom || isDerivedTo))) {
+                        continue;
+                    }
+                    const entriesTargetForPathIdentifier = await getEntries(id);
+                    if (entriesTargetForPathIdentifier) {
+                        entriesTargetForPathIdentifier.push(id);
+                    }
+                }
+                return Array.from(matches.values()).flat();
+            }).pipe(
+            // only take definitions that have matching path identifiers
+            (0, rxjs_1.filter)((pathIdentifiers) => pathIdentifiers.length > 0), 
+            // for each definition that we're going to use, apply query-level filter
+            (0, rxjs_1.map)((pathIdentifiers) => applyECInstanceIdsFilter(definition, pathIdentifiers)));
+        }))).pipe((0, rxjs_1.toArray)()));
     }
-    return result;
 }
-/** @internal */
-// eslint-disable-next-line @typescript-eslint/naming-convention
-exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor = "HasFilterTargetAncestor";
+exports.FilteringHierarchyDefinition = FilteringHierarchyDefinition;
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 exports.ECSQL_COLUMN_NAME_FilterECInstanceId = "FilterECInstanceId";
 /** @internal */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 exports.ECSQL_COLUMN_NAME_FilterClassName = "FilterClassName";
-function getClassECInstanceIds(matchingFilters) {
+function getClassECInstanceIds(filteredInstanceKeys) {
     const classNameECInstanceIds = new Map();
-    for (const matchingFilter of matchingFilters) {
-        const entry = classNameECInstanceIds.get(matchingFilter.id.className);
+    for (const key of filteredInstanceKeys) {
+        const entry = classNameECInstanceIds.get(key.className);
         if (entry === undefined) {
-            classNameECInstanceIds.set(matchingFilter.id.className, [matchingFilter.id.id]);
+            classNameECInstanceIds.set(key.className, [key.id]);
             continue;
         }
-        entry.push(matchingFilter.id.id);
+        entry.push(key.id);
     }
     return classNameECInstanceIds;
 }
 /** @internal */
-function applyECInstanceIdsFilter(def, matchingFilters, hasFilterTargetAncestor) {
-    if (matchingFilters.length === 0) {
-        return def;
-    }
-    const matchingFiltersToUse = getClassECInstanceIds(matchingFilters);
+function applyECInstanceIdsFilter(def, filteredInstanceKeys) {
+    const instanceIdsByClass = getClassECInstanceIds(filteredInstanceKeys);
     return {
         ...def,
         query: {
@@ -289,7 +227,7 @@ function applyECInstanceIdsFilter(def, matchingFilters, hasFilterTargetAncestor)
             ctes: [
                 ...(def.query.ctes ?? []),
                 `FilteringInfo(ECInstanceId, FilterClassName) AS (
-          ${Array.from(matchingFiltersToUse)
+          ${Array.from(instanceIdsByClass)
                     .map(([className, ecInstanceIds]) => `
                 SELECT ECInstanceId, '${className}' AS FilterClassName
                 FROM ${className}
@@ -301,13 +239,28 @@ function applyECInstanceIdsFilter(def, matchingFilters, hasFilterTargetAncestor)
             ecsql: `
         SELECT
           [q].*,
-          ${hasFilterTargetAncestor ? "1" : "0"} AS [${exports.ECSQL_COLUMN_NAME_HasFilterTargetAncestor}],
           IdToHex([f].[ECInstanceId]) AS [${exports.ECSQL_COLUMN_NAME_FilterECInstanceId}],
           [f].[FilterClassName] AS [${exports.ECSQL_COLUMN_NAME_FilterClassName}]
         FROM (
           ${def.query.ecsql}
         ) [q]
-        ${hasFilterTargetAncestor ? "LEFT " : ""} JOIN FilteringInfo [f] ON [f].[ECInstanceId] = [q].[ECInstanceId]
+        JOIN FilteringInfo [f] ON [f].[ECInstanceId] = [q].[ECInstanceId]
+      `,
+        },
+    };
+}
+/** @internal */
+function applyECInstanceIdsSelector(def) {
+    return {
+        ...def,
+        query: {
+            ...def.query,
+            ecsql: `
+        SELECT
+          [q].*,
+          IdToHex([q].[ECInstanceId]) AS [${exports.ECSQL_COLUMN_NAME_FilterECInstanceId}],
+          [q].[${NodeSelectQueryFactory_js_1.NodeSelectClauseColumnNames.FullClassName}] 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 { 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"]}
+{"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 { defer, filter, firstValueFrom, map, merge, mergeMap, of, toArray } from \"rxjs\";\nimport { Id64String } from \"@itwin/core-bentley\";\nimport { ECClassHierarchyInspector, InstanceKey } from \"@itwin/presentation-shared\";\nimport { createHierarchyFilteringHelper, HierarchyFilteringPath } from \"../HierarchyFiltering.js\";\nimport { HierarchyNodeIdentifier } from \"../HierarchyNodeIdentifier.js\";\nimport { IModelInstanceKey } from \"../HierarchyNodeKey.js\";\nimport { partition } from \"../internal/operators/Partition.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, SourceInstanceHierarchyNode } from \"./IModelHierarchyNode.js\";\nimport { NodeSelectClauseColumnNames } from \"./NodeSelectQueryFactory.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 parsedNode = await (this._source.parseNode ?? defaultNodesParser)(row);\n\n      const filteringHelper = createHierarchyFilteringHelper(this._nodeIdentifierPaths, parentNode);\n      const nodeExtraProps =\n        row[ECSQL_COLUMN_NAME_FilterECInstanceId] && row[ECSQL_COLUMN_NAME_FilterClassName]\n          ? await (async () => {\n              const rowInstanceKey = { className: row[ECSQL_COLUMN_NAME_FilterClassName], id: row[ECSQL_COLUMN_NAME_FilterECInstanceId] };\n              return filteringHelper.createChildNodePropsAsync({\n                pathMatcher: (identifier): boolean | Promise<boolean> => {\n                  if (identifier.id !== rowInstanceKey.id) {\n                    return false;\n                  }\n                  if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(identifier)) {\n                    return false;\n                  }\n                  if (identifier.imodelKey && identifier.imodelKey !== this._imodelAccess.imodelKey) {\n                    return false;\n                  }\n                  if (identifier.className === rowInstanceKey.className) {\n                    return true;\n                  }\n                  return Promise.all([\n                    this._imodelAccess.classDerivesFrom(identifier.className, rowInstanceKey.className),\n                    this._imodelAccess.classDerivesFrom(rowInstanceKey.className, identifier.className),\n                  ]).then(([isDerivedFrom, isDerivedTo]) => isDerivedFrom || isDerivedTo);\n                },\n              });\n            })()\n          : undefined;\n      if (nodeExtraProps?.autoExpand) {\n        parsedNode.autoExpand = true;\n      }\n      if (nodeExtraProps?.filtering) {\n        parsedNode.filtering = nodeExtraProps.filtering;\n      }\n\n      return parsedNode;\n    };\n  }\n\n  public async defineHierarchyLevel(props: DefineHierarchyLevelProps): Promise<HierarchyLevelDefinition> {\n    const sourceDefinitions = await this._source.defineHierarchyLevel(props);\n\n    const filteringHelper = createHierarchyFilteringHelper(this._nodeIdentifierPaths, props.parentNode);\n    const childNodeFilteringIdentifiers = filteringHelper.getChildNodeFilteringIdentifiers();\n    if (!childNodeFilteringIdentifiers) {\n      return sourceDefinitions;\n    }\n\n    const [genericNodeDefinitions, instanceNodeDefinitions] = partition(sourceDefinitions, HierarchyNodesDefinition.isGenericNode);\n    return firstValueFrom(\n      merge(\n        genericNodeDefinitions.pipe(\n          map((definition) => {\n            if (\n              filteringHelper.hasFilterTargetAncestor ||\n              childNodeFilteringIdentifiers.some(\n                (identifier) =>\n                  HierarchyNodeIdentifier.isGenericNodeIdentifier(identifier) &&\n                  (!identifier.source || identifier.source === this._imodelAccess.imodelKey) &&\n                  identifier.id === definition.node.key,\n              )\n            ) {\n              return {\n                ...definition,\n                node: {\n                  ...definition.node,\n                  ...filteringHelper.createChildNodeProps({ pathMatcher: ({ id }) => id === definition.node.key }),\n                },\n              };\n            }\n            return undefined;\n          }),\n          filter((def): def is GenericHierarchyNodeDefinition => !!def),\n        ),\n\n        instanceNodeDefinitions.pipe(\n          mergeMap((definition) => {\n            if (filteringHelper.hasFilterTargetAncestor) {\n              // if we have a filter target ancestor, we don't need to filter the definitions - we use all of them\n              return of(applyECInstanceIdsSelector(definition));\n            }\n            return defer(async () => {\n              const imodelAccess = this._imodelAccess;\n              const matches = new Map<Id64String, IModelInstanceKey[]>();\n              async function getEntries(x: IModelInstanceKey) {\n                let entries = matches.get(x.id);\n                if (!entries) {\n                  entries = [];\n                  matches.set(x.id, entries);\n                }\n                // make sure that we don't have path identifiers that only differ by class name, where\n                // class names are in the same class hierarchy, e.g.:\n                // [{ className: \"bis.Element\", id: \"0x1\" }, { className: \"bis.Subject\", id: \"0x1\" }]\n                // are actually the same instance, so we only need to keep one of them, or otherwise the query will\n                // duplicate it\n                for (const entry of entries) {\n                  if (\n                    entry.className === x.className ||\n                    (await imodelAccess.classDerivesFrom(entry.className, x.className)) ||\n                    (await imodelAccess.classDerivesFrom(x.className, entry.className))\n                  ) {\n                    return undefined;\n                  }\n                }\n                return entries;\n              }\n              for (const id of childNodeFilteringIdentifiers) {\n                // take only identifiers that match the definition by type, source and class\n                if (!HierarchyNodeIdentifier.isInstanceNodeIdentifier(id)) {\n                  continue;\n                }\n                if (id.imodelKey && id.imodelKey !== imodelAccess.imodelKey) {\n                  continue;\n                }\n                if (\n                  id.className !== definition.fullClassName &&\n                  !(await Promise.all([\n                    imodelAccess.classDerivesFrom(id.className, definition.fullClassName),\n                    imodelAccess.classDerivesFrom(definition.fullClassName, id.className),\n                  ]).then(([isDerivedFrom, isDerivedTo]) => isDerivedFrom || isDerivedTo))\n                ) {\n                  continue;\n                }\n                const entriesTargetForPathIdentifier = await getEntries(id);\n                if (entriesTargetForPathIdentifier) {\n                  entriesTargetForPathIdentifier.push(id);\n                }\n              }\n              return Array.from(matches.values()).flat();\n            }).pipe(\n              // only take definitions that have matching path identifiers\n              filter((pathIdentifiers) => pathIdentifiers.length > 0),\n\n              // for each definition that we're going to use, apply query-level filter\n              map((pathIdentifiers) => applyECInstanceIdsFilter(definition, pathIdentifiers)),\n            );\n          }),\n        ),\n      ).pipe(toArray()),\n    );\n  }\n}\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(filteredInstanceKeys: InstanceKey[]) {\n  const classNameECInstanceIds = new Map<string, Id64String[]>();\n  for (const key of filteredInstanceKeys) {\n    const entry = classNameECInstanceIds.get(key.className);\n    if (entry === undefined) {\n      classNameECInstanceIds.set(key.className, [key.id]);\n      continue;\n    }\n    entry.push(key.id);\n  }\n  return classNameECInstanceIds;\n}\n\n/** @internal */\nexport function applyECInstanceIdsFilter(def: InstanceNodesQueryDefinition, filteredInstanceKeys: InstanceKey[]): InstanceNodesQueryDefinition {\n  const instanceIdsByClass = getClassECInstanceIds(filteredInstanceKeys);\n  return {\n    ...def,\n    query: {\n      ...def.query,\n      ctes: [\n        ...(def.query.ctes ?? []),\n        `FilteringInfo(ECInstanceId, FilterClassName) AS (\n          ${Array.from(instanceIdsByClass)\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          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        JOIN FilteringInfo [f] ON [f].[ECInstanceId] = [q].[ECInstanceId]\n      `,\n    },\n  };\n}\n\n/** @internal */\nexport function applyECInstanceIdsSelector(def: InstanceNodesQueryDefinition): InstanceNodesQueryDefinition {\n  return {\n    ...def,\n    query: {\n      ...def.query,\n      ecsql: `\n        SELECT\n          [q].*,\n          IdToHex([q].[ECInstanceId]) AS [${ECSQL_COLUMN_NAME_FilterECInstanceId}],\n          [q].[${NodeSelectClauseColumnNames.FullClassName}] AS [${ECSQL_COLUMN_NAME_FilterClassName}]\n        FROM (${def.query.ecsql}) [q]\n      `,\n    },\n  };\n}\n"]}