@itwin/presentation-common 4.0.0-dev.52 → 4.0.0-dev.55

package/lib/cjs/presentation-common/RpcRequestsHandler.d.ts

@@ -1,83 +1,83 @@
-/** @packageDocumentation
- * @module RPC
- */
-import { IModelRpcProps } from "@itwin/core-common";
-import { DescriptorJSON, DescriptorOverrides } from "./content/Descriptor";
-import { ItemJSON } from "./content/Item";
-import { DisplayValueGroupJSON } from "./content/Value";
-import { ClientDiagnosticsAttribute } from "./Diagnostics";
-import { InstanceKey } from "./EC";
-import { ElementProperties } from "./ElementProperties";
-import { NodeKey } from "./hierarchy/Key";
-import { NodeJSON } from "./hierarchy/Node";
-import { NodePathElementJSON } from "./hierarchy/NodePathElement";
-import { KeySetJSON } from "./KeySet";
-import { LabelDefinition } from "./LabelDefinition";
-import { ComputeSelectionRequestOptions, ContentDescriptorRequestOptions, ContentInstanceKeysRequestOptions, ContentRequestOptions, ContentSourcesRequestOptions, DisplayLabelRequestOptions, DisplayLabelsRequestOptions, DistinctValuesRequestOptions, FilterByInstancePathsHierarchyRequestOptions, FilterByTextHierarchyRequestOptions, HierarchyLevelDescriptorRequestOptions, HierarchyRequestOptions, Paged, RequestOptions, SelectionScopeRequestOptions, SingleElementPropertiesRequestOptions } from "./PresentationManagerOptions";
-import { ContentSourcesRpcResult, PresentationRpcRequestOptions, PresentationRpcResponse } from "./PresentationRpcInterface";
-import { RulesetVariableJSON } from "./RulesetVariables";
-import { SelectionScope } from "./selection/SelectionScope";
-import { PagedResponse } from "./Utils";
-/**
- * Configuration parameters for [[RpcRequestsHandler]].
- *
- * @internal
- */
-export interface RpcRequestsHandlerProps {
-    /**
-     * Optional ID used to identify client that requests data. If not specified,
-     * the handler creates a unique GUID as a client id.
-     * @internal
-     */
-    clientId?: string;
-    /** @internal */
-    timeout?: number;
-}
-/**
- * RPC requests handler that wraps [[PresentationRpcInterface]] and
- * adds handling for cases when backend needs to be synced with client
- * state.
- *
- * @internal
- */
-export declare class RpcRequestsHandler {
-    /** Timeout for how long the handler going to wait for RPC request to be fulfilled before throwing a timeout error. */
-    readonly timeout: number;
-    /** ID that identifies this handler as a client */
-    readonly clientId: string;
-    constructor(props?: RpcRequestsHandlerProps);
-    private get rpcClient();
-    private requestWithTimeout;
-    /**
-     * Send the request to backend.
-     *
-     * If the backend responds with [[PresentationStatus.BackendTimeout]], the request is repeated until we hit `timeout` or get
-     * a response. If the response is other than [[PresentationStatus.BackendTimeout]] or [[PresentationStatus.Success]], a [[PresentationError]]
-     * is thrown with the details from the response.
-     */
-    request<TResult, TOptions extends (RequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute), TArg = any>(func: (token: IModelRpcProps, options: PresentationRpcRequestOptions<TOptions>, ...args: TArg[]) => PresentationRpcResponse<TResult>, options: TOptions, ...additionalOptions: TArg[]): Promise<TResult>;
-    getNodesCount(options: HierarchyRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<number>;
-    getPagedNodes(options: Paged<HierarchyRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON>> & ClientDiagnosticsAttribute): Promise<PagedResponse<NodeJSON>>;
-    getNodesDescriptor(options: HierarchyLevelDescriptorRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<DescriptorJSON | undefined>;
-    getNodePaths(options: FilterByInstancePathsHierarchyRequestOptions<IModelRpcProps, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<NodePathElementJSON[]>;
-    getFilteredNodePaths(options: FilterByTextHierarchyRequestOptions<IModelRpcProps, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<NodePathElementJSON[]>;
-    getContentSources(options: ContentSourcesRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<ContentSourcesRpcResult>;
-    getContentDescriptor(options: ContentDescriptorRequestOptions<IModelRpcProps, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<DescriptorJSON | undefined>;
-    getContentSetSize(options: ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<number>;
-    getPagedContent(options: Paged<ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute>): Promise<{
-        descriptor: DescriptorJSON;
-        contentSet: PagedResponse<ItemJSON>;
-    } | undefined>;
-    getPagedContentSet(options: Paged<ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute>): Promise<PagedResponse<ItemJSON>>;
-    getPagedDistinctValues(options: DistinctValuesRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<PagedResponse<DisplayValueGroupJSON>>;
-    getElementProperties(options: SingleElementPropertiesRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<ElementProperties | undefined>;
-    getContentInstanceKeys(options: ContentInstanceKeysRequestOptions<IModelRpcProps, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<{
-        total: number;
-        items: KeySetJSON;
-    }>;
-    getDisplayLabelDefinition(options: DisplayLabelRequestOptions<IModelRpcProps, InstanceKey> & ClientDiagnosticsAttribute): Promise<LabelDefinition>;
-    getPagedDisplayLabelDefinitions(options: DisplayLabelsRequestOptions<IModelRpcProps, InstanceKey> & ClientDiagnosticsAttribute): Promise<PagedResponse<LabelDefinition>>;
-    getSelectionScopes(options: SelectionScopeRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<SelectionScope[]>;
-    computeSelection(options: ComputeSelectionRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<KeySetJSON>;
-}
+/** @packageDocumentation
+ * @module RPC
+ */
+import { IModelRpcProps } from "@itwin/core-common";
+import { DescriptorJSON, DescriptorOverrides } from "./content/Descriptor";
+import { ItemJSON } from "./content/Item";
+import { DisplayValueGroupJSON } from "./content/Value";
+import { ClientDiagnosticsAttribute } from "./Diagnostics";
+import { InstanceKey } from "./EC";
+import { ElementProperties } from "./ElementProperties";
+import { NodeKey } from "./hierarchy/Key";
+import { NodeJSON } from "./hierarchy/Node";
+import { NodePathElementJSON } from "./hierarchy/NodePathElement";
+import { KeySetJSON } from "./KeySet";
+import { LabelDefinition } from "./LabelDefinition";
+import { ComputeSelectionRequestOptions, ContentDescriptorRequestOptions, ContentInstanceKeysRequestOptions, ContentRequestOptions, ContentSourcesRequestOptions, DisplayLabelRequestOptions, DisplayLabelsRequestOptions, DistinctValuesRequestOptions, FilterByInstancePathsHierarchyRequestOptions, FilterByTextHierarchyRequestOptions, HierarchyLevelDescriptorRequestOptions, HierarchyRequestOptions, Paged, RequestOptions, SelectionScopeRequestOptions, SingleElementPropertiesRequestOptions } from "./PresentationManagerOptions";
+import { ContentSourcesRpcResult, PresentationRpcRequestOptions, PresentationRpcResponse } from "./PresentationRpcInterface";
+import { RulesetVariableJSON } from "./RulesetVariables";
+import { SelectionScope } from "./selection/SelectionScope";
+import { PagedResponse } from "./Utils";
+/**
+ * Configuration parameters for [[RpcRequestsHandler]].
+ *
+ * @internal
+ */
+export interface RpcRequestsHandlerProps {
+    /**
+     * Optional ID used to identify client that requests data. If not specified,
+     * the handler creates a unique GUID as a client id.
+     * @internal
+     */
+    clientId?: string;
+    /** @internal */
+    timeout?: number;
+}
+/**
+ * RPC requests handler that wraps [[PresentationRpcInterface]] and
+ * adds handling for cases when backend needs to be synced with client
+ * state.
+ *
+ * @internal
+ */
+export declare class RpcRequestsHandler {
+    /** Timeout for how long the handler going to wait for RPC request to be fulfilled before throwing a timeout error. */
+    readonly timeout: number;
+    /** ID that identifies this handler as a client */
+    readonly clientId: string;
+    constructor(props?: RpcRequestsHandlerProps);
+    private get rpcClient();
+    private requestWithTimeout;
+    /**
+     * Send the request to backend.
+     *
+     * If the backend responds with [[PresentationStatus.BackendTimeout]], the request is repeated until we hit `timeout` or get
+     * a response. If the response is other than [[PresentationStatus.BackendTimeout]] or [[PresentationStatus.Success]], a [[PresentationError]]
+     * is thrown with the details from the response.
+     */
+    request<TResult, TOptions extends (RequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute), TArg = any>(func: (token: IModelRpcProps, options: PresentationRpcRequestOptions<TOptions>, ...args: TArg[]) => PresentationRpcResponse<TResult>, options: TOptions, ...additionalOptions: TArg[]): Promise<TResult>;
+    getNodesCount(options: HierarchyRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<number>;
+    getPagedNodes(options: Paged<HierarchyRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON>> & ClientDiagnosticsAttribute): Promise<PagedResponse<NodeJSON>>;
+    getNodesDescriptor(options: HierarchyLevelDescriptorRequestOptions<IModelRpcProps, NodeKey, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<DescriptorJSON | undefined>;
+    getNodePaths(options: FilterByInstancePathsHierarchyRequestOptions<IModelRpcProps, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<NodePathElementJSON[]>;
+    getFilteredNodePaths(options: FilterByTextHierarchyRequestOptions<IModelRpcProps, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<NodePathElementJSON[]>;
+    getContentSources(options: ContentSourcesRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<ContentSourcesRpcResult>;
+    getContentDescriptor(options: ContentDescriptorRequestOptions<IModelRpcProps, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<DescriptorJSON | undefined>;
+    getContentSetSize(options: ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<number>;
+    getPagedContent(options: Paged<ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute>): Promise<{
+        descriptor: DescriptorJSON;
+        contentSet: PagedResponse<ItemJSON>;
+    } | undefined>;
+    getPagedContentSet(options: Paged<ContentRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute>): Promise<PagedResponse<ItemJSON>>;
+    getPagedDistinctValues(options: DistinctValuesRequestOptions<IModelRpcProps, DescriptorOverrides, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<PagedResponse<DisplayValueGroupJSON>>;
+    getElementProperties(options: SingleElementPropertiesRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<ElementProperties | undefined>;
+    getContentInstanceKeys(options: ContentInstanceKeysRequestOptions<IModelRpcProps, KeySetJSON, RulesetVariableJSON> & ClientDiagnosticsAttribute): Promise<{
+        total: number;
+        items: KeySetJSON;
+    }>;
+    getDisplayLabelDefinition(options: DisplayLabelRequestOptions<IModelRpcProps, InstanceKey> & ClientDiagnosticsAttribute): Promise<LabelDefinition>;
+    getPagedDisplayLabelDefinitions(options: DisplayLabelsRequestOptions<IModelRpcProps, InstanceKey> & ClientDiagnosticsAttribute): Promise<PagedResponse<LabelDefinition>>;
+    getSelectionScopes(options: SelectionScopeRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<SelectionScope[]>;
+    computeSelection(options: ComputeSelectionRequestOptions<IModelRpcProps> & ClientDiagnosticsAttribute): Promise<KeySetJSON>;
+}
 //# sourceMappingURL=RpcRequestsHandler.d.ts.map

package/lib/cjs/presentation-common/RpcRequestsHandler.js

@@ -1,167 +1,167 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module RPC
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcRequestsHandler = void 0;
-const core_bentley_1 = require("@itwin/core-bentley");
-const core_common_1 = require("@itwin/core-common");
-const CommonLoggerCategory_1 = require("./CommonLoggerCategory");
-const Error_1 = require("./Error");
-const PresentationRpcInterface_1 = require("./PresentationRpcInterface");
-/**
- * Default timeout for how long we're going to wait for RPC request to be fulfilled before throwing
- * a timeout error.
- */
-const DEFAULT_REQUEST_TIMEOUT = 10 * 60 * 1000; // 10 minutes
-/**
- * RPC requests handler that wraps [[PresentationRpcInterface]] and
- * adds handling for cases when backend needs to be synced with client
- * state.
- *
- * @internal
- */
-class RpcRequestsHandler {
-    constructor(props) {
-        this.clientId = props?.clientId ?? core_bentley_1.Guid.createValue();
-        this.timeout = props?.timeout ?? DEFAULT_REQUEST_TIMEOUT;
-    }
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    get rpcClient() { return core_common_1.RpcManager.getClientForInterface(PresentationRpcInterface_1.PresentationRpcInterface); }
-    async requestWithTimeout(func, diagnosticsHandler) {
-        const start = core_bentley_1.BeTimePoint.now();
-        const timeout = core_bentley_1.BeDuration.fromMilliseconds(this.timeout);
-        let diagnostics;
-        while (start.plus(timeout).isInFuture) {
-            try {
-                const response = await func();
-                diagnostics = response.diagnostics;
-                switch (response.statusCode) {
-                    case Error_1.PresentationStatus.Success: return response.result;
-                    case Error_1.PresentationStatus.BackendTimeout: break;
-                    default: throw new Error_1.PresentationError(response.statusCode, response.errorMessage);
-                }
-            }
-            finally {
-                diagnosticsHandler && diagnostics && diagnosticsHandler(diagnostics);
-            }
-        }
-        throw new Error_1.PresentationError(Error_1.PresentationStatus.BackendTimeout);
-    }
-    /**
-     * Send the request to backend.
-     *
-     * If the backend responds with [[PresentationStatus.BackendTimeout]], the request is repeated until we hit `timeout` or get
-     * a response. If the response is other than [[PresentationStatus.BackendTimeout]] or [[PresentationStatus.Success]], a [[PresentationError]]
-     * is thrown with the details from the response.
-     */
-    async request(func, options, ...additionalOptions) {
-        const { imodel, diagnostics, ...optionsNoIModel } = options;
-        const { handler: diagnosticsHandler, ...diagnosticsOptions } = diagnostics ?? {};
-        if (isOptionsWithRuleset(optionsNoIModel)) {
-            optionsNoIModel.rulesetOrId = cleanupRuleset(optionsNoIModel.rulesetOrId);
-        }
-        const rpcOptions = {
-            ...optionsNoIModel,
-            clientId: this.clientId,
-        };
-        if (diagnostics) {
-            rpcOptions.diagnostics = diagnosticsOptions;
-        }
-        const doRequest = async () => func(imodel, rpcOptions, ...additionalOptions);
-        return this.requestWithTimeout(doRequest, diagnosticsHandler);
-    }
-    async getNodesCount(options) {
-        return this.request(this.rpcClient.getNodesCount.bind(this.rpcClient), options);
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    async getPagedNodes(options) {
-        // eslint-disable-next-line deprecation/deprecation
-        return this.request(this.rpcClient.getPagedNodes.bind(this.rpcClient), options);
-    }
-    async getNodesDescriptor(options) {
-        const response = await this.request(this.rpcClient.getNodesDescriptor.bind(this.rpcClient), options);
-        if (typeof response === "string")
-            return JSON.parse(response);
-        return response;
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    async getNodePaths(options) {
-        // eslint-disable-next-line deprecation/deprecation
-        return this.request(this.rpcClient.getNodePaths.bind(this.rpcClient), options);
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    async getFilteredNodePaths(options) {
-        // eslint-disable-next-line deprecation/deprecation
-        return this.request(this.rpcClient.getFilteredNodePaths.bind(this.rpcClient), options);
-    }
-    async getContentSources(options) {
-        return this.request(this.rpcClient.getContentSources.bind(this.rpcClient), options);
-    }
-    async getContentDescriptor(options) {
-        return this.request(this.rpcClient.getContentDescriptor.bind(this.rpcClient), options);
-    }
-    async getContentSetSize(options) {
-        return this.request(this.rpcClient.getContentSetSize.bind(this.rpcClient), options);
-    }
-    async getPagedContent(options) {
-        return this.request(this.rpcClient.getPagedContent.bind(this.rpcClient), options);
-    }
-    async getPagedContentSet(options) {
-        return this.request(this.rpcClient.getPagedContentSet.bind(this.rpcClient), options);
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    async getPagedDistinctValues(options) {
-        // eslint-disable-next-line deprecation/deprecation
-        return this.request(this.rpcClient.getPagedDistinctValues.bind(this.rpcClient), options);
-    }
-    async getElementProperties(options) {
-        return this.request(this.rpcClient.getElementProperties.bind(this.rpcClient), options);
-    }
-    async getContentInstanceKeys(options) {
-        return this.request(this.rpcClient.getContentInstanceKeys.bind(this.rpcClient), options);
-    }
-    async getDisplayLabelDefinition(options) {
-        return this.request(this.rpcClient.getDisplayLabelDefinition.bind(this.rpcClient), options);
-    }
-    async getPagedDisplayLabelDefinitions(options) {
-        return this.request(this.rpcClient.getPagedDisplayLabelDefinitions.bind(this.rpcClient), options);
-    }
-    async getSelectionScopes(options) {
-        return this.request(this.rpcClient.getSelectionScopes.bind(this.rpcClient), options);
-    }
-    async computeSelection(options) {
-        return this.request(
-        // eslint-disable-next-line deprecation/deprecation
-        this.rpcClient.computeSelection.bind(this.rpcClient), options);
-    }
-}
-exports.RpcRequestsHandler = RpcRequestsHandler;
-function isOptionsWithRuleset(options) {
-    return (typeof options.rulesetOrId === "object");
-}
-const RULESET_SUPPORTED_PROPERTIES_OBJ = {
-    id: true,
-    rules: true,
-    version: true,
-    requiredSchemas: true,
-    supplementationInfo: true,
-    vars: true,
-};
-function cleanupRuleset(ruleset) {
-    const cleanedUpRuleset = { ...ruleset };
-    for (const propertyKey of Object.keys(cleanedUpRuleset)) {
-        if (!RULESET_SUPPORTED_PROPERTIES_OBJ.hasOwnProperty(propertyKey)) {
-            if (propertyKey === "$schema")
-                delete cleanedUpRuleset[propertyKey];
-            else
-                core_bentley_1.Logger.logWarning(CommonLoggerCategory_1.PresentationCommonLoggerCategory.Package, `Provided ruleset contains unrecognized attribute '${propertyKey}'. It either doesn't exist or may be no longer supported.`);
-        }
-    }
-    return cleanedUpRuleset;
-}
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module RPC
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RpcRequestsHandler = void 0;
+const core_bentley_1 = require("@itwin/core-bentley");
+const core_common_1 = require("@itwin/core-common");
+const CommonLoggerCategory_1 = require("./CommonLoggerCategory");
+const Error_1 = require("./Error");
+const PresentationRpcInterface_1 = require("./PresentationRpcInterface");
+/**
+ * Default timeout for how long we're going to wait for RPC request to be fulfilled before throwing
+ * a timeout error.
+ */
+const DEFAULT_REQUEST_TIMEOUT = 10 * 60 * 1000; // 10 minutes
+/**
+ * RPC requests handler that wraps [[PresentationRpcInterface]] and
+ * adds handling for cases when backend needs to be synced with client
+ * state.
+ *
+ * @internal
+ */
+class RpcRequestsHandler {
+    constructor(props) {
+        this.clientId = props?.clientId ?? core_bentley_1.Guid.createValue();
+        this.timeout = props?.timeout ?? DEFAULT_REQUEST_TIMEOUT;
+    }
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    get rpcClient() { return core_common_1.RpcManager.getClientForInterface(PresentationRpcInterface_1.PresentationRpcInterface); }
+    async requestWithTimeout(func, diagnosticsHandler) {
+        const start = core_bentley_1.BeTimePoint.now();
+        const timeout = core_bentley_1.BeDuration.fromMilliseconds(this.timeout);
+        let diagnostics;
+        while (start.plus(timeout).isInFuture) {
+            try {
+                const response = await func();
+                diagnostics = response.diagnostics;
+                switch (response.statusCode) {
+                    case Error_1.PresentationStatus.Success: return response.result;
+                    case Error_1.PresentationStatus.BackendTimeout: break;
+                    default: throw new Error_1.PresentationError(response.statusCode, response.errorMessage);
+                }
+            }
+            finally {
+                diagnosticsHandler && diagnostics && diagnosticsHandler(diagnostics);
+            }
+        }
+        throw new Error_1.PresentationError(Error_1.PresentationStatus.BackendTimeout);
+    }
+    /**
+     * Send the request to backend.
+     *
+     * If the backend responds with [[PresentationStatus.BackendTimeout]], the request is repeated until we hit `timeout` or get
+     * a response. If the response is other than [[PresentationStatus.BackendTimeout]] or [[PresentationStatus.Success]], a [[PresentationError]]
+     * is thrown with the details from the response.
+     */
+    async request(func, options, ...additionalOptions) {
+        const { imodel, diagnostics, ...optionsNoIModel } = options;
+        const { handler: diagnosticsHandler, ...diagnosticsOptions } = diagnostics ?? {};
+        if (isOptionsWithRuleset(optionsNoIModel)) {
+            optionsNoIModel.rulesetOrId = cleanupRuleset(optionsNoIModel.rulesetOrId);
+        }
+        const rpcOptions = {
+            ...optionsNoIModel,
+            clientId: this.clientId,
+        };
+        if (diagnostics) {
+            rpcOptions.diagnostics = diagnosticsOptions;
+        }
+        const doRequest = async () => func(imodel, rpcOptions, ...additionalOptions);
+        return this.requestWithTimeout(doRequest, diagnosticsHandler);
+    }
+    async getNodesCount(options) {
+        return this.request(this.rpcClient.getNodesCount.bind(this.rpcClient), options);
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    async getPagedNodes(options) {
+        // eslint-disable-next-line deprecation/deprecation
+        return this.request(this.rpcClient.getPagedNodes.bind(this.rpcClient), options);
+    }
+    async getNodesDescriptor(options) {
+        const response = await this.request(this.rpcClient.getNodesDescriptor.bind(this.rpcClient), options);
+        if (typeof response === "string")
+            return JSON.parse(response);
+        return response;
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    async getNodePaths(options) {
+        // eslint-disable-next-line deprecation/deprecation
+        return this.request(this.rpcClient.getNodePaths.bind(this.rpcClient), options);
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    async getFilteredNodePaths(options) {
+        // eslint-disable-next-line deprecation/deprecation
+        return this.request(this.rpcClient.getFilteredNodePaths.bind(this.rpcClient), options);
+    }
+    async getContentSources(options) {
+        return this.request(this.rpcClient.getContentSources.bind(this.rpcClient), options);
+    }
+    async getContentDescriptor(options) {
+        return this.request(this.rpcClient.getContentDescriptor.bind(this.rpcClient), options);
+    }
+    async getContentSetSize(options) {
+        return this.request(this.rpcClient.getContentSetSize.bind(this.rpcClient), options);
+    }
+    async getPagedContent(options) {
+        return this.request(this.rpcClient.getPagedContent.bind(this.rpcClient), options);
+    }
+    async getPagedContentSet(options) {
+        return this.request(this.rpcClient.getPagedContentSet.bind(this.rpcClient), options);
+    }
+    // eslint-disable-next-line deprecation/deprecation
+    async getPagedDistinctValues(options) {
+        // eslint-disable-next-line deprecation/deprecation
+        return this.request(this.rpcClient.getPagedDistinctValues.bind(this.rpcClient), options);
+    }
+    async getElementProperties(options) {
+        return this.request(this.rpcClient.getElementProperties.bind(this.rpcClient), options);
+    }
+    async getContentInstanceKeys(options) {
+        return this.request(this.rpcClient.getContentInstanceKeys.bind(this.rpcClient), options);
+    }
+    async getDisplayLabelDefinition(options) {
+        return this.request(this.rpcClient.getDisplayLabelDefinition.bind(this.rpcClient), options);
+    }
+    async getPagedDisplayLabelDefinitions(options) {
+        return this.request(this.rpcClient.getPagedDisplayLabelDefinitions.bind(this.rpcClient), options);
+    }
+    async getSelectionScopes(options) {
+        return this.request(this.rpcClient.getSelectionScopes.bind(this.rpcClient), options);
+    }
+    async computeSelection(options) {
+        return this.request(
+        // eslint-disable-next-line deprecation/deprecation
+        this.rpcClient.computeSelection.bind(this.rpcClient), options);
+    }
+}
+exports.RpcRequestsHandler = RpcRequestsHandler;
+function isOptionsWithRuleset(options) {
+    return (typeof options.rulesetOrId === "object");
+}
+const RULESET_SUPPORTED_PROPERTIES_OBJ = {
+    id: true,
+    rules: true,
+    version: true,
+    requiredSchemas: true,
+    supplementationInfo: true,
+    vars: true,
+};
+function cleanupRuleset(ruleset) {
+    const cleanedUpRuleset = { ...ruleset };
+    for (const propertyKey of Object.keys(cleanedUpRuleset)) {
+        if (!RULESET_SUPPORTED_PROPERTIES_OBJ.hasOwnProperty(propertyKey)) {
+            if (propertyKey === "$schema")
+                delete cleanedUpRuleset[propertyKey];
+            else
+                core_bentley_1.Logger.logWarning(CommonLoggerCategory_1.PresentationCommonLoggerCategory.Package, `Provided ruleset contains unrecognized attribute '${propertyKey}'. It either doesn't exist or may be no longer supported.`);
+        }
+    }
+    return cleanedUpRuleset;
+}
 //# sourceMappingURL=RpcRequestsHandler.js.map