diff --git a/.github/workflows/benchmark-pr.yml b/.github/workflows/benchmark-pr.yml index d4ca5e41e..45fa83a52 100644 --- a/.github/workflows/benchmark-pr.yml +++ b/.github/workflows/benchmark-pr.yml @@ -8,7 +8,7 @@ on: paths: - apps/performance-tests/** - packages/core-interop/** - - packages/hierarchy-builder/** + - packages/hierarchies/** - packages/models-tree/** - pnpm-lock.yaml - .github/workflows/benchmark-pr.yaml diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 34147b1c6..9c14fe8fa 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -8,7 +8,7 @@ on: paths: - apps/performance-tests/** - packages/core-interop/** - - packages/hierarchy-builder/** + - packages/hierarchies/** - packages/models-tree/** jobs: diff --git a/.vscode/launch.json b/.vscode/launch.json index 4c9f67d31..ed0f6ec42 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,10 @@ "name": "[test-app] Start Frontend Server", "cwd": "${workspaceRoot}/apps/test-app/frontend", "runtimeExecutable": "npm", - "runtimeArgs": ["run", "start"] + "runtimeArgs": [ + "run", + "start" + ] }, { "type": "node", @@ -131,17 +134,22 @@ "type": "node", "request": "launch", "runtimeExecutable": "npx", - "runtimeArgs": ["mocha", "--config", "./.mocharc.json", "./lib/*test.js"], + "runtimeArgs": [ + "mocha", + "--config", + "./.mocharc.json", + "./lib/*test.js" + ], "env": { "NODE_OPTIONS": "--enable-source-maps" } }, { "name": "Tests: Hierarchy builder", - "cwd": "${workspaceFolder}/packages/hierarchy-builder", + "cwd": "${workspaceFolder}/packages/hierarchies", "type": "node", "request": "launch", - "program": "${workspaceFolder}/packages/hierarchy-builder/node_modules/mocha/bin/_mocha", + "program": "${workspaceFolder}/packages/hierarchies/node_modules/mocha/bin/_mocha", "args": [ "--config", "./.mocharc.json", @@ -149,7 +157,7 @@ "lib/cjs/test/**/*.test.js" ], "outFiles": [ - "${workspaceFolder}/packages/hierarchy-builder/lib/**/*.js" + "${workspaceFolder}/packages/hierarchies/lib/**/*.js" ], "env": { "NODE_ENV": "development" @@ -188,7 +196,7 @@ "outFiles": [ "${workspaceFolder}/packages/components/lib/**/*.js", "${workspaceFolder}/packages/core-interop/lib/**/*.js", - "${workspaceFolder}/packages/hierarchy-builder/lib/**/*.js", + "${workspaceFolder}/packages/hierarchies/lib/**/*.js", "${workspaceFolder}/packages/models-tree/lib/**/*.js", "${workspaceFolder}/packages/testing/lib/**/*.js", "${workspaceFolder}/packages/full-stack-tests/lib/**/*.js" diff --git a/apps/load-tests/README.md b/apps/load-tests/README.md index f5b54d586..b1758514b 100644 --- a/apps/load-tests/README.md +++ b/apps/load-tests/README.md @@ -37,7 +37,7 @@ Script to run the scenario: `npm run start:full-models-tree`. #### Full Models tree load - stateless implementation -The scenario simulates 1 user fully loading the Models Tree hierarchy using the `@itwin/presentation-hierarchy-builder` package that makes `IModelReadRpcInterface-queryRows` RPC calls to execute ECSQL queries. +The scenario simulates 1 user fully loading the Models Tree hierarchy using the `@itwin/presentation-hierarchies` package that makes `IModelReadRpcInterface-queryRows` RPC calls to execute ECSQL queries. Script to run the scenario: `npm run start:full-models-tree-stateless`. @@ -49,7 +49,7 @@ Script to run the scenario: `npm run start:initial-models-tree`. #### Initial Models tree load - stateless implementation -The scenario simulates 1 user loading 2 first levels of Models Tree hierarchy using the `@itwin/presentation-hierarchy-builder` package that makes `IModelReadRpcInterface-queryRows` RPC calls to execute ECSQL queries. +The scenario simulates 1 user loading 2 first levels of Models Tree hierarchy using the `@itwin/presentation-hierarchies` package that makes `IModelReadRpcInterface-queryRows` RPC calls to execute ECSQL queries. Script to run the scenario: `npm run start:initial-models-tree-stateless`. diff --git a/apps/load-tests/tests/package.json b/apps/load-tests/tests/package.json index ce55e4d54..2d80f3cef 100644 --- a/apps/load-tests/tests/package.json +++ b/apps/load-tests/tests/package.json @@ -28,7 +28,7 @@ "@itwin/ecschema-rpcinterface-common": "^4.4.0", "@itwin/eslint-plugin": "4.0.0-dev.48", "@itwin/presentation-common": "^4.4.0", - "@itwin/presentation-hierarchy-builder": "workspace:*", + "@itwin/presentation-hierarchies": "workspace:*", "@itwin/presentation-core-interop": "workspace:*", "@itwin/presentation-models-tree": "workspace:*", "@types/artillery": "^1.7.4", diff --git a/apps/load-tests/tests/src/processors/models-tree-stateless.ts b/apps/load-tests/tests/src/processors/models-tree-stateless.ts index 3782b2226..8bff4dd5a 100644 --- a/apps/load-tests/tests/src/processors/models-tree-stateless.ts +++ b/apps/load-tests/tests/src/processors/models-tree-stateless.ts @@ -10,7 +10,7 @@ import { Guid, StopWatch } from "@itwin/core-bentley"; import { DbQueryRequest, DbQueryResponse, DbRequestExecutor, ECSqlReader } from "@itwin/core-common"; import { ISchemaLocater, Schema, SchemaContext, SchemaInfo, SchemaKey, SchemaMatchType, SchemaProps } from "@itwin/ecschema-metadata"; import { createECSqlQueryExecutor, createMetadataProvider } from "@itwin/presentation-core-interop"; -import { createLimitingECSqlQueryExecutor, HierarchyNode, HierarchyProvider } from "@itwin/presentation-hierarchy-builder"; +import { createLimitingECSqlQueryExecutor, HierarchyNode, HierarchyProvider } from "@itwin/presentation-hierarchies"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; import { doRequest, getCurrentIModelName, getCurrentIModelPath, loadNodes } from "./common"; diff --git a/apps/performance-tests/package.json b/apps/performance-tests/package.json index 2a78604aa..b71c53580 100644 --- a/apps/performance-tests/package.json +++ b/apps/performance-tests/package.json @@ -16,7 +16,7 @@ "@itwin/core-common": "^4.4.0", "@itwin/ecschema-metadata": "^4.4.0", "@itwin/presentation-core-interop": "workspace:*", - "@itwin/presentation-hierarchy-builder": "workspace:*", + "@itwin/presentation-hierarchies": "workspace:*", "@itwin/presentation-models-tree": "workspace:*", "as-table": "^1.0.55", "blocked": "^1.3.0", diff --git a/apps/performance-tests/src/StatelessHierarchyProvider.ts b/apps/performance-tests/src/StatelessHierarchyProvider.ts index 939cbedcc..d00147822 100644 --- a/apps/performance-tests/src/StatelessHierarchyProvider.ts +++ b/apps/performance-tests/src/StatelessHierarchyProvider.ts @@ -13,7 +13,7 @@ import { HierarchyProvider, IHierarchyLevelDefinitionsFactory, IMetadataProvider, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; export interface ProviderOptions { iModel: IModelDb; diff --git a/apps/performance-tests/src/main.ts b/apps/performance-tests/src/main.ts index 68a097402..3d19f0d27 100644 --- a/apps/performance-tests/src/main.ts +++ b/apps/performance-tests/src/main.ts @@ -6,7 +6,7 @@ import { IModelHost } from "@itwin/core-backend"; import { Logger, LogLevel } from "@itwin/core-bentley"; import { createLogger } from "@itwin/presentation-core-interop"; -import { setLogger } from "@itwin/presentation-hierarchy-builder"; +import { setLogger } from "@itwin/presentation-hierarchies"; import { Datasets } from "./Datasets"; before(async () => { diff --git a/apps/performance-tests/src/stateless.test.ts b/apps/performance-tests/src/stateless.test.ts index c8c5be63c..dfca0ae33 100644 --- a/apps/performance-tests/src/stateless.test.ts +++ b/apps/performance-tests/src/stateless.test.ts @@ -5,7 +5,7 @@ import { expect } from "chai"; import { IModelDb, PhysicalElement, SnapshotDb } from "@itwin/core-backend"; -import { IMetadataProvider, NodeSelectClauseProps, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { IMetadataProvider, NodeSelectClauseProps, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; import { Datasets, IModelName } from "./Datasets"; import { ProviderOptions, StatelessHierarchyProvider } from "./StatelessHierarchyProvider"; diff --git a/apps/test-app/frontend/package.json b/apps/test-app/frontend/package.json index 9d2b27ac3..5cf9ad556 100644 --- a/apps/test-app/frontend/package.json +++ b/apps/test-app/frontend/package.json @@ -33,7 +33,7 @@ "@itwin/presentation-common": "^4.4.0", "@itwin/presentation-components": "workspace:*", "@itwin/presentation-frontend": "^4.4.0", - "@itwin/presentation-hierarchy-builder": "workspace:*", + "@itwin/presentation-hierarchies": "workspace:*", "@itwin/presentation-hierarchies-react": "workspace:*", "@itwin/presentation-core-interop": "workspace:*", "@itwin/presentation-models-tree": "workspace:*", diff --git a/apps/test-app/frontend/src/components/tree-widget/stateless-v2/Tree.tsx b/apps/test-app/frontend/src/components/tree-widget/stateless-v2/Tree.tsx index 765f657d0..355acb64d 100644 --- a/apps/test-app/frontend/src/components/tree-widget/stateless-v2/Tree.tsx +++ b/apps/test-app/frontend/src/components/tree-widget/stateless-v2/Tree.tsx @@ -19,6 +19,15 @@ import { } from "@itwin/presentation-components"; import { createECSqlQueryExecutor, createHierarchyLevelDescriptor, createMetadataProvider } from "@itwin/presentation-core-interop"; import { Presentation } from "@itwin/presentation-frontend"; +import { + createLimitingECSqlQueryExecutor, + GenericInstanceFilter, + HierarchyProvider, + ILimitingECSqlQueryExecutor, + IMetadataProvider, + NonGroupingHierarchyNode, + TypedPrimitiveValue, +} from "@itwin/presentation-hierarchies"; import { HierarchyLevelFilteringOptions, PresentationHierarchyNode, @@ -28,15 +37,6 @@ import { UnifiedSelectionStore, useUnifiedSelectionTree, } from "@itwin/presentation-hierarchies-react"; -import { - createLimitingECSqlQueryExecutor, - GenericInstanceFilter, - HierarchyProvider, - ILimitingECSqlQueryExecutor, - IMetadataProvider, - NonGroupingHierarchyNode, - TypedPrimitiveValue, -} from "@itwin/presentation-hierarchy-builder"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; interface MetadataProviders { diff --git a/apps/test-app/frontend/src/components/tree-widget/stateless/CustomHooks.ts b/apps/test-app/frontend/src/components/tree-widget/stateless/CustomHooks.ts index 1d4009f85..fb30ca561 100644 --- a/apps/test-app/frontend/src/components/tree-widget/stateless/CustomHooks.ts +++ b/apps/test-app/frontend/src/components/tree-widget/stateless/CustomHooks.ts @@ -5,7 +5,7 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { RenderedItemsRange, TreeDataProvider, TreeModelSource, TreeNodeLoader } from "@itwin/components-react"; -import { HierarchyProvider, IPrimitiveValueFormatter } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyProvider, IPrimitiveValueFormatter } from "@itwin/presentation-hierarchies"; import { startTreeReload } from "./TreeReloader"; interface ControlledTreeComponents { diff --git a/apps/test-app/frontend/src/components/tree-widget/stateless/Tree.tsx b/apps/test-app/frontend/src/components/tree-widget/stateless/Tree.tsx index 282cba409..6b5235bf9 100644 --- a/apps/test-app/frontend/src/components/tree-widget/stateless/Tree.tsx +++ b/apps/test-app/frontend/src/components/tree-widget/stateless/Tree.tsx @@ -33,7 +33,7 @@ import { IMetadataProvider, RowsLimitExceededError, TypedPrimitiveValue, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; import { TreeWidgetHeader, useTreeHeight } from "../TreeHeader"; import { TreeWidgetProps } from "../TreeWidget"; diff --git a/apps/test-app/frontend/src/components/tree-widget/stateless/TreeNodeItemUtils.ts b/apps/test-app/frontend/src/components/tree-widget/stateless/TreeNodeItemUtils.ts index 90e77b808..e380b1b33 100644 --- a/apps/test-app/frontend/src/components/tree-widget/stateless/TreeNodeItemUtils.ts +++ b/apps/test-app/frontend/src/components/tree-widget/stateless/TreeNodeItemUtils.ts @@ -6,7 +6,7 @@ import { PropertyRecord } from "@itwin/appui-abstract"; import { DelayLoadedTreeNodeItem, TreeNodeItem } from "@itwin/components-react"; import { InfoTreeNodeItemType, PresentationInfoTreeNodeItem } from "@itwin/presentation-components"; -import { HierarchyNode, HierarchyNodeKey } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyNode, HierarchyNodeKey } from "@itwin/presentation-hierarchies"; export function getHierarchyNode(item: TreeNodeItem): HierarchyNode | undefined { if ("__internal" in item) { diff --git a/apps/test-app/frontend/src/components/tree-widget/stateless/UnifiedSelectionTreeEventHandler.ts b/apps/test-app/frontend/src/components/tree-widget/stateless/UnifiedSelectionTreeEventHandler.ts index a6ebc8440..d977fb085 100644 --- a/apps/test-app/frontend/src/components/tree-widget/stateless/UnifiedSelectionTreeEventHandler.ts +++ b/apps/test-app/frontend/src/components/tree-widget/stateless/UnifiedSelectionTreeEventHandler.ts @@ -20,7 +20,7 @@ import { Guid, IDisposable } from "@itwin/core-bentley"; import { IModelConnection } from "@itwin/core-frontend"; import { GroupingNodeKey, Key, KeySet, PresentationQuery, PresentationQueryBinding, StandardNodeTypes } from "@itwin/presentation-common"; import { Presentation, SelectionChangeEventArgs, SelectionChangeType, SelectionHandler } from "@itwin/presentation-frontend"; -import { HierarchyNode, InstanceKey, parseFullClassName } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyNode, InstanceKey, parseFullClassName } from "@itwin/presentation-hierarchies"; import { getHierarchyNode, serializeNodeKey } from "./TreeNodeItemUtils"; export interface UnifiedSelectionTreeEventHandlerParams { diff --git a/packages/core-interop/api/presentation-core-interop.api.md b/packages/core-interop/api/presentation-core-interop.api.md index 4f79a2ec9..734b4af37 100644 --- a/packages/core-interop/api/presentation-core-interop.api.md +++ b/packages/core-interop/api/presentation-core-interop.api.md @@ -7,13 +7,13 @@ import { ContentDescriptorRequestOptions } from '@itwin/presentation-common'; import { Descriptor } from '@itwin/presentation-common'; import { ECSqlReader } from '@itwin/core-common'; -import { HierarchyProvider } from '@itwin/presentation-hierarchy-builder'; -import { IECSqlQueryExecutor } from '@itwin/presentation-hierarchy-builder'; -import { ILogger } from '@itwin/presentation-hierarchy-builder'; -import { IMetadataProvider } from '@itwin/presentation-hierarchy-builder'; -import { IPrimitiveValueFormatter } from '@itwin/presentation-hierarchy-builder'; +import { HierarchyProvider } from '@itwin/presentation-hierarchies'; +import { IECSqlQueryExecutor } from '@itwin/presentation-hierarchies'; +import { ILogger } from '@itwin/presentation-hierarchies'; +import { IMetadataProvider } from '@itwin/presentation-hierarchies'; +import { IPrimitiveValueFormatter } from '@itwin/presentation-hierarchies'; import { KeySet } from '@itwin/presentation-common'; -import { NonGroupingHierarchyNode } from '@itwin/presentation-hierarchy-builder'; +import { NonGroupingHierarchyNode } from '@itwin/presentation-hierarchies'; import { QueryBinder } from '@itwin/core-common'; import { QueryOptions } from '@itwin/core-common'; import { RulesetVariable } from '@itwin/presentation-common'; diff --git a/packages/core-interop/package.json b/packages/core-interop/package.json index b278c9337..67fb74a40 100644 --- a/packages/core-interop/package.json +++ b/packages/core-interop/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/presentation-core-interop", "version": "0.0.0", - "description": "A package that has peer dependencies on both `@itwin/presentation-hierarchy-builder` and core packages and provides an interop layer between them.", + "description": "A package that has peer dependencies on both `@itwin/presentation-hierarchies` and core packages and provides an interop layer between them.", "private": true, "repository": { "type": "git", @@ -44,7 +44,7 @@ "@itwin/core-quantity": "^4.1.0", "@itwin/ecschema-metadata": "^4.1.0", "@itwin/presentation-common": "^4.1.0", - "@itwin/presentation-hierarchy-builder": "workspace:^" + "@itwin/presentation-hierarchies": "workspace:^" }, "devDependencies": { "@itwin/build-tools": "^4.4.0", @@ -58,7 +58,7 @@ "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", "@itwin/presentation-common": "^4.4.0", - "@itwin/presentation-hierarchy-builder": "workspace:^", + "@itwin/presentation-hierarchies": "workspace:^", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", "chai": "^4.4.1", diff --git a/packages/core-interop/src/core-interop/Formatting.ts b/packages/core-interop/src/core-interop/Formatting.ts index aad048556..a1ea83762 100644 --- a/packages/core-interop/src/core-interop/Formatting.ts +++ b/packages/core-interop/src/core-interop/Formatting.ts @@ -15,7 +15,7 @@ import { SchemaUnitProvider, Unit, } from "@itwin/ecschema-metadata"; -import { createDefaultValueFormatter, IPrimitiveValueFormatter, parseFullClassName, TypedPrimitiveValue } from "@itwin/presentation-hierarchy-builder"; +import { createDefaultValueFormatter, IPrimitiveValueFormatter, parseFullClassName, TypedPrimitiveValue } from "@itwin/presentation-hierarchies"; /** * Creates a formatter that knows how to format values of properties with assigned kind of quantity. In case the property diff --git a/packages/core-interop/src/core-interop/HierarchyLevelDescriptor.ts b/packages/core-interop/src/core-interop/HierarchyLevelDescriptor.ts index 11b41ac8a..3af4849bf 100644 --- a/packages/core-interop/src/core-interop/HierarchyLevelDescriptor.ts +++ b/packages/core-interop/src/core-interop/HierarchyLevelDescriptor.ts @@ -16,7 +16,7 @@ import { InstancesNodeKey, NodeSelectClauseColumnNames, NonGroupingHierarchyNode, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; import { ICoreECSqlReaderFactory } from "./QueryExecutor"; /** @@ -124,7 +124,7 @@ function recursivelyGetInstanceKeys( visible.pipe(map(({ key }) => key)), // return child node keys of hidden instances hidden.pipe( - // handling similar to `createHideNodesInHierarchyOperator` in `presentation-hierarchy-builder` package - first + // handling similar to `createHideNodesInHierarchyOperator` in `presentation-hierarchies` package - first // merge all keys by class reduce<{ key: InstanceKey; hide: boolean }, InstanceClassMergeMap>((acc, { key }) => { addToMergeMap(acc, key); diff --git a/packages/core-interop/src/core-interop/Logging.ts b/packages/core-interop/src/core-interop/Logging.ts index 5af56ce69..1802b23b8 100644 --- a/packages/core-interop/src/core-interop/Logging.ts +++ b/packages/core-interop/src/core-interop/Logging.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Logger as CoreLogger, LogLevel as CoreLogLevel } from "@itwin/core-bentley"; -import { ILogger, LogLevel } from "@itwin/presentation-hierarchy-builder"; +import { ILogger, LogLevel } from "@itwin/presentation-hierarchies"; /** * Create an `ILogger` that uses [Logger]($core-bentley) API to log messages. diff --git a/packages/core-interop/src/core-interop/Metadata.ts b/packages/core-interop/src/core-interop/Metadata.ts index ed9394a5d..82f69722c 100644 --- a/packages/core-interop/src/core-interop/Metadata.ts +++ b/packages/core-interop/src/core-interop/Metadata.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { SchemaContext, SchemaKey } from "@itwin/ecschema-metadata"; -import { IMetadataProvider } from "@itwin/presentation-hierarchy-builder"; +import { IMetadataProvider } from "@itwin/presentation-hierarchies"; import { createECSchema } from "./MetadataInternal"; /** diff --git a/packages/core-interop/src/core-interop/MetadataInternal.ts b/packages/core-interop/src/core-interop/MetadataInternal.ts index b943a9188..45985a772 100644 --- a/packages/core-interop/src/core-interop/MetadataInternal.ts +++ b/packages/core-interop/src/core-interop/MetadataInternal.ts @@ -48,7 +48,7 @@ import { ECStructArrayProperty, ECStructClass, ECStructProperty, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; /** @internal */ export function createECSchema(schema: CoreSchema): ECSchema { diff --git a/packages/core-interop/src/core-interop/QueryExecutor.ts b/packages/core-interop/src/core-interop/QueryExecutor.ts index 44e4fa932..89935a78e 100644 --- a/packages/core-interop/src/core-interop/QueryExecutor.ts +++ b/packages/core-interop/src/core-interop/QueryExecutor.ts @@ -6,7 +6,7 @@ import { OrderedId64Iterable } from "@itwin/core-bentley"; import { ECSqlReader, QueryBinder, QueryOptions, QueryOptionsBuilder, QueryRowFormat } from "@itwin/core-common"; import { Point2d, Point3d } from "@itwin/core-geometry"; -import { ECSqlBinding, ECSqlQueryReader, ECSqlQueryReaderOptions, ECSqlQueryRow, IECSqlQueryExecutor } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlBinding, ECSqlQueryReader, ECSqlQueryReaderOptions, ECSqlQueryRow, IECSqlQueryExecutor } from "@itwin/presentation-hierarchies"; /** * An interface for something that knows how to create an `ECSqlReader`. Generally, this represents either [IModelDb]($core-backend) diff --git a/packages/core-interop/src/test/Formatting.test.ts b/packages/core-interop/src/test/Formatting.test.ts index 584eb8f66..5fb96fc02 100644 --- a/packages/core-interop/src/test/Formatting.test.ts +++ b/packages/core-interop/src/test/Formatting.test.ts @@ -19,7 +19,7 @@ import { Unit, UnitSystem, } from "@itwin/ecschema-metadata"; -import { IPrimitiveValueFormatter, TypedPrimitiveValue } from "@itwin/presentation-hierarchy-builder"; +import { IPrimitiveValueFormatter, TypedPrimitiveValue } from "@itwin/presentation-hierarchies"; import { createValueFormatter } from "../core-interop/Formatting"; describe("createValueFormatter", () => { diff --git a/packages/core-interop/src/test/HierarchyLevelDescriptor.test.ts b/packages/core-interop/src/test/HierarchyLevelDescriptor.test.ts index a02351a88..bd4d69210 100644 --- a/packages/core-interop/src/test/HierarchyLevelDescriptor.test.ts +++ b/packages/core-interop/src/test/HierarchyLevelDescriptor.test.ts @@ -16,14 +16,7 @@ import { KeySet, Ruleset, } from "@itwin/presentation-common"; -import { - DefineHierarchyLevelProps, - ECSqlQueryDef, - HierarchyNode, - HierarchyProvider, - InstanceKey, - InstancesNodeKey, -} from "@itwin/presentation-hierarchy-builder"; +import { DefineHierarchyLevelProps, ECSqlQueryDef, HierarchyNode, HierarchyProvider, InstanceKey, InstancesNodeKey } from "@itwin/presentation-hierarchies"; import { createHierarchyLevelDescriptor } from "../core-interop/HierarchyLevelDescriptor"; describe("createHierarchyLevelDescriptor", () => { diff --git a/packages/core-interop/src/test/Metadata.test.ts b/packages/core-interop/src/test/Metadata.test.ts index 0eb79cb59..82a69c9cd 100644 --- a/packages/core-interop/src/test/Metadata.test.ts +++ b/packages/core-interop/src/test/Metadata.test.ts @@ -5,6 +5,7 @@ import { expect } from "chai"; import sinon from "sinon"; +import { assert } from "@itwin/core-bentley"; import { ECClass as CoreClass, EnumerationArrayProperty as CoreEnumerationArrayProperty, @@ -35,7 +36,7 @@ import { ECSchema, ECStructArrayProperty, ECStructProperty, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; import { createMetadataProvider } from "../core-interop/Metadata"; import { createECClass, createECProperty, createECSchema } from "../core-interop/MetadataInternal"; @@ -54,11 +55,12 @@ describe("createMetadataProvider", () => { const provider = createMetadataProvider(schemaContext); const schema = await provider.getSchema("x"); + assert(schema !== undefined); // eslint-disable-next-line @typescript-eslint/unbound-method expect(schemaContext.getSchema).to.be.calledOnceWith(matchSchemaName); - expect(schema!.name).to.eq("y"); - expect(typeof schema!.getClass === "function").to.be.true; + expect(schema.name).to.eq("y"); + expect(typeof schema.getClass === "function").to.be.true; }); it("returns undefined from schema context", async () => { @@ -92,14 +94,15 @@ describe("createECSchema", () => { const schema = createECSchema(coreSchema); const result = await schema.getClass("c"); + assert(result !== undefined); // eslint-disable-next-line @typescript-eslint/unbound-method expect(coreSchema.getItem).to.be.calledOnceWith("c"); - expect(result!.schema.name).to.eq("s"); - expect(result!.fullName).to.eq("s.c"); - expect(result!.name).to.eq("c"); - expect(result!.label).to.eq("C"); - expect(typeof result!.is === "function").to.be.true; + expect(result.schema.name).to.eq("s"); + expect(result.fullName).to.eq("s.c"); + expect(result.name).to.eq("c"); + expect(result.label).to.eq("C"); + expect(typeof result.is === "function").to.be.true; }); it("returns undefined from core schema", async () => { diff --git a/packages/core-interop/src/test/QueryExecutor.test.ts b/packages/core-interop/src/test/QueryExecutor.test.ts index 1f6e74fb8..832b809f4 100644 --- a/packages/core-interop/src/test/QueryExecutor.test.ts +++ b/packages/core-interop/src/test/QueryExecutor.test.ts @@ -7,7 +7,7 @@ import { expect } from "chai"; import sinon from "sinon"; import { QueryBinder, QueryOptions, QueryRowFormat } from "@itwin/core-common"; import { Point2d, Point3d } from "@itwin/core-geometry"; -import { ECSqlBinding } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlBinding } from "@itwin/presentation-hierarchies"; import { createECSqlQueryExecutor, ICoreECSqlReaderFactory } from "../core-interop/QueryExecutor"; describe("createECSqlQueryExecutor", () => { diff --git a/packages/full-stack-tests/package.json b/packages/full-stack-tests/package.json index 690041b18..8dfce7326 100644 --- a/packages/full-stack-tests/package.json +++ b/packages/full-stack-tests/package.json @@ -35,7 +35,7 @@ "@itwin/presentation-common": "^4.4.0", "@itwin/presentation-components": "workspace:^", "@itwin/presentation-frontend": "^4.4.0", - "@itwin/presentation-hierarchy-builder": "workspace:^", + "@itwin/presentation-hierarchies": "workspace:^", "@itwin/presentation-core-interop": "workspace:^", "@itwin/presentation-models-tree": "workspace:^", "@itwin/presentation-testing": "workspace:^", diff --git a/packages/full-stack-tests/src/IModelUtils.ts b/packages/full-stack-tests/src/IModelUtils.ts index 39954f6ae..9f0b44002 100644 --- a/packages/full-stack-tests/src/IModelUtils.ts +++ b/packages/full-stack-tests/src/IModelUtils.ts @@ -13,7 +13,7 @@ import { ECDb, ECSqlStatement, IModelJsFs } from "@itwin/core-backend"; import { BentleyError, DbResult, Id64, Id64String, OrderedId64Iterable } from "@itwin/core-bentley"; import { LocalFileName } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; -import { ECSqlBinding, parseFullClassName, Point2d, Point3d, PrimitiveValue } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlBinding, parseFullClassName, Point2d, Point3d, PrimitiveValue } from "@itwin/presentation-hierarchies"; import { buildTestIModel, TestIModelBuilder } from "@itwin/presentation-testing"; import { createFileNameFromString } from "@itwin/presentation-testing/lib/cjs/presentation-testing/InternalUtils"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/Formatting.test.ts b/packages/full-stack-tests/src/hierarchy-builder/Formatting.test.ts index 5c9b63092..6c99ab62b 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/Formatting.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/Formatting.test.ts @@ -20,8 +20,8 @@ import { Guid, Id64 } from "@itwin/core-bentley"; import { IModel, Rank } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; import { createValueFormatter } from "@itwin/presentation-core-interop"; -import { ECSqlSnippets, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; -import { julianToDateTime } from "@itwin/presentation-hierarchy-builder/lib/cjs/hierarchy-builder/internal/Common"; +import { ECSqlSnippets, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; +import { julianToDateTime } from "@itwin/presentation-hierarchies/lib/cjs/hierarchies/internal/Common"; import { buildIModel, importSchema } from "../IModelUtils"; import { initialize, terminate } from "../IntegrationTests"; import { validateHierarchy } from "./HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/HierarchyFiltering.test.ts b/packages/full-stack-tests/src/hierarchy-builder/HierarchyFiltering.test.ts index 42452354e..10aa78ebc 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/HierarchyFiltering.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/HierarchyFiltering.test.ts @@ -6,7 +6,7 @@ import { insertSubject } from "presentation-test-utilities"; import { Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; -import { ECSqlBinding, HierarchyNode, Id64String, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlBinding, HierarchyNode, Id64String, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel, importSchema, withECDb } from "../IModelUtils"; import { initialize, terminate } from "../IntegrationTests"; import { NodeValidators, validateHierarchy } from "./HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelDescriptors.test.ts b/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelDescriptors.test.ts index c8a140ba8..1184dabe3 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelDescriptors.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelDescriptors.test.ts @@ -10,7 +10,7 @@ import { Presentation as PresentationBackend } from "@itwin/presentation-backend import { Descriptor, PropertyValueFormat } from "@itwin/presentation-common"; import { createHierarchyLevelDescriptor } from "@itwin/presentation-core-interop"; import { Presentation as PresentationFrontend } from "@itwin/presentation-frontend"; -import { HierarchyNode, IHierarchyLevelDefinitionsFactory, InstanceKey, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyNode, IHierarchyLevelDefinitionsFactory, InstanceKey, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildTestIModel } from "@itwin/presentation-testing"; import { setupOutputFileLocation } from "@itwin/presentation-testing/lib/cjs/presentation-testing/InternalUtils"; import { initialize, terminate } from "../IntegrationTests"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelFiltering.test.ts b/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelFiltering.test.ts index c31c3daeb..e8ab8db16 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelFiltering.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/HierarchyLevelFiltering.test.ts @@ -3,7 +3,7 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -import { GroupingHierarchyNode, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory, ParentHierarchyNode } from "@itwin/presentation-hierarchy-builder"; +import { GroupingHierarchyNode, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory, ParentHierarchyNode } from "@itwin/presentation-hierarchies"; import { importSchema, withECDb } from "../IModelUtils"; import { initialize, terminate } from "../IntegrationTests"; import { NodeValidators, validateHierarchyLevel } from "./HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/HierarchyValidation.ts b/packages/full-stack-tests/src/hierarchy-builder/HierarchyValidation.ts index 0f62cfa6f..4058fa6a9 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/HierarchyValidation.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/HierarchyValidation.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { Logger } from "@itwin/core-bentley"; -import { HierarchyNode, HierarchyProvider, InstanceKey, NonGroupingHierarchyNode } from "@itwin/presentation-hierarchy-builder"; -import { hasChildren } from "@itwin/presentation-hierarchy-builder/lib/cjs/hierarchy-builder/internal/Common"; +import { HierarchyNode, HierarchyProvider, InstanceKey, NonGroupingHierarchyNode } from "@itwin/presentation-hierarchies"; +import { hasChildren } from "@itwin/presentation-hierarchies/lib/cjs/hierarchies/internal/Common"; const loggingNamespace = `Presentation.HierarchyBuilder.HierarchyValidation`; diff --git a/packages/full-stack-tests/src/hierarchy-builder/Update.test.ts b/packages/full-stack-tests/src/hierarchy-builder/Update.test.ts index f504d96ad..74e80a2a4 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/Update.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/Update.test.ts @@ -37,7 +37,7 @@ import { BriefcaseConnection, IpcApp, NullRenderSystem } from "@itwin/core-front import { ECSchemaRpcInterface } from "@itwin/ecschema-rpcinterface-common"; import { ECSchemaRpcImpl } from "@itwin/ecschema-rpcinterface-impl"; import { registerTxnListeners } from "@itwin/presentation-core-interop"; -import { ECSqlSnippets, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlSnippets, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { createFileNameFromString } from "@itwin/presentation-testing/lib/cjs/presentation-testing/InternalUtils"; import { setupOutputFileLocation } from "../IModelUtils"; import { NodeValidators, validateHierarchyLevel } from "./HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/Utils.ts b/packages/full-stack-tests/src/hierarchy-builder/Utils.ts index fa19d0051..9bc27eb00 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/Utils.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/Utils.ts @@ -16,7 +16,7 @@ import { IHierarchyLevelDefinitionsFactory, IPrimitiveValueFormatter, parseFullClassName, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; function createSchemaContext(imodel: IModelConnection | IModelDb | ECDb) { const schemas = new SchemaContext(); diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/AutoExpand.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/AutoExpand.test.ts index af17a1c1f..e06944735 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/AutoExpand.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/AutoExpand.test.ts @@ -7,7 +7,7 @@ import { insertSubject } from "presentation-test-utilities"; import { Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; -import { ECSqlSelectClauseGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlSelectClauseGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/BaseClassGrouping.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/BaseClassGrouping.test.ts index f966f7266..afe8591b0 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/BaseClassGrouping.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/BaseClassGrouping.test.ts @@ -7,7 +7,7 @@ import { insertPhysicalPartition, insertSubject } from "presentation-test-utilit import { PhysicalPartition, Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; -import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/ClassGrouping.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/ClassGrouping.test.ts index b03b7fbda..36d914bfb 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/ClassGrouping.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/ClassGrouping.test.ts @@ -6,7 +6,7 @@ import { insertPhysicalPartition, insertSubject } from "presentation-test-utilities"; import { PhysicalPartition, Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; -import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/GroupHiding.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/GroupHiding.test.ts index c99482a4e..d8164704b 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/GroupHiding.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/GroupHiding.test.ts @@ -7,7 +7,7 @@ import { insertPhysicalPartition, insertSubject } from "presentation-test-utilit import { PhysicalPartition, Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; -import { ECSqlSelectClauseGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlSelectClauseGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/LabelGrouping.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/LabelGrouping.test.ts index 2dff094c2..2a1489c8b 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/LabelGrouping.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/LabelGrouping.test.ts @@ -6,7 +6,7 @@ import { insertSubject } from "presentation-test-utilities"; import { Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; -import { HierarchyNode, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyNode, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/MultiLevelGrouping.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/MultiLevelGrouping.test.ts index cef21f0d1..e35e146f9 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/MultiLevelGrouping.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/MultiLevelGrouping.test.ts @@ -6,7 +6,7 @@ import { insertPhysicalPartition, insertSubject } from "presentation-test-utilities"; import { PhysicalPartition, Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; -import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/grouping/PropertiesGrouping.test.ts b/packages/full-stack-tests/src/hierarchy-builder/grouping/PropertiesGrouping.test.ts index 55d5f8b53..8e32ef7c1 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/grouping/PropertiesGrouping.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/grouping/PropertiesGrouping.test.ts @@ -7,7 +7,7 @@ import { insertSubject } from "presentation-test-utilities"; import { Subject } from "@itwin/core-backend"; import { IModel } from "@itwin/core-common"; import { IModelConnection } from "@itwin/core-frontend"; -import { ECSqlSelectClausePropertiesGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchy-builder"; +import { ECSqlSelectClausePropertiesGroupingParams, IHierarchyLevelDefinitionsFactory, NodeSelectQueryFactory } from "@itwin/presentation-hierarchies"; import { buildIModel, importSchema, withECDb } from "../../IModelUtils"; import { initialize, terminate } from "../../IntegrationTests"; import { NodeValidators, validateHierarchy } from "../HierarchyValidation"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeCompareWithNative.test.ts b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeCompareWithNative.test.ts index 49c0e6698..c7665ab7a 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeCompareWithNative.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeCompareWithNative.test.ts @@ -11,7 +11,7 @@ import { IModelConnection, SnapshotConnection } from "@itwin/core-frontend"; import { InstanceKey, NodeKey, Ruleset } from "@itwin/presentation-common"; import { isPresentationTreeNodeItem, PresentationTreeDataProvider, PresentationTreeNodeItem } from "@itwin/presentation-components"; import { createLogger } from "@itwin/presentation-core-interop"; -import { ClassGroupingNodeKey, HierarchyNode, InstancesNodeKey, setLogger } from "@itwin/presentation-hierarchy-builder"; +import { ClassGroupingNodeKey, HierarchyNode, InstancesNodeKey, setLogger } from "@itwin/presentation-hierarchies"; import { initialize, terminate } from "../../IntegrationTests"; import { createModelsTreeProvider } from "./ModelsTreeTestUtils"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeFiltering.test.ts b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeFiltering.test.ts index fa7a4c26f..8c30b5539 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeFiltering.test.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeFiltering.test.ts @@ -19,8 +19,8 @@ import { SchemaContext } from "@itwin/ecschema-metadata"; import { ECSchemaRpcLocater } from "@itwin/ecschema-rpcinterface-common"; import { InstanceKey } from "@itwin/presentation-common"; import { createECSqlQueryExecutor, createMetadataProvider } from "@itwin/presentation-core-interop"; -import { HierarchyNodeIdentifier, HierarchyNodeIdentifiersPath, HierarchyProvider } from "@itwin/presentation-hierarchy-builder"; -import { addCTEs } from "@itwin/presentation-hierarchy-builder/lib/cjs/hierarchy-builder/queries/LimitingECSqlQueryExecutor"; +import { HierarchyNodeIdentifier, HierarchyNodeIdentifiersPath, HierarchyProvider } from "@itwin/presentation-hierarchies"; +import { addCTEs } from "@itwin/presentation-hierarchies/lib/cjs/hierarchies/queries/LimitingECSqlQueryExecutor"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; import { buildTestIModel, TestIModelBuilder } from "@itwin/presentation-testing"; import { buildIModel } from "../../IModelUtils"; diff --git a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeTestUtils.ts b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeTestUtils.ts index 476da0f5f..f8d345ef7 100644 --- a/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeTestUtils.ts +++ b/packages/full-stack-tests/src/hierarchy-builder/models-tree/ModelsTreeTestUtils.ts @@ -7,7 +7,7 @@ import { IModelConnection } from "@itwin/core-frontend"; import { SchemaContext } from "@itwin/ecschema-metadata"; import { ECSchemaRpcLocater } from "@itwin/ecschema-rpcinterface-common"; import { createECSqlQueryExecutor, createMetadataProvider } from "@itwin/presentation-core-interop"; -import { createLimitingECSqlQueryExecutor, HierarchyNodeIdentifiersPath, HierarchyProvider } from "@itwin/presentation-hierarchy-builder"; +import { createLimitingECSqlQueryExecutor, HierarchyNodeIdentifiersPath, HierarchyProvider } from "@itwin/presentation-hierarchies"; import { ModelsTreeDefinition } from "@itwin/presentation-models-tree"; import { TestIModelBuilder } from "@itwin/presentation-testing"; import { importSchema } from "../../IModelUtils"; diff --git a/packages/hierarchies-react/api/presentation-hierarchies-react.api.md b/packages/hierarchies-react/api/presentation-hierarchies-react.api.md index 404b2bbe4..4fa92eed4 100644 --- a/packages/hierarchies-react/api/presentation-hierarchies-react.api.md +++ b/packages/hierarchies-react/api/presentation-hierarchies-react.api.md @@ -4,9 +4,9 @@ ```ts -import { GenericInstanceFilter } from '@itwin/presentation-hierarchy-builder'; -import { HierarchyNode } from '@itwin/presentation-hierarchy-builder'; -import { HierarchyProvider } from '@itwin/presentation-hierarchy-builder'; +import { GenericInstanceFilter } from '@itwin/presentation-hierarchies'; +import { HierarchyNode } from '@itwin/presentation-hierarchies'; +import { HierarchyProvider } from '@itwin/presentation-hierarchies'; import { JSX as JSX_2 } from 'react/jsx-runtime'; import { Key } from '@itwin/presentation-common'; import { PropsWithChildren } from 'react'; diff --git a/packages/hierarchies-react/package.json b/packages/hierarchies-react/package.json index ef53b7f29..676503e5d 100644 --- a/packages/hierarchies-react/package.json +++ b/packages/hierarchies-react/package.json @@ -44,7 +44,7 @@ "@itwin/itwinui-icons-react": "^2.8.0", "@itwin/itwinui-illustrations-react": "^2.1.0", "@itwin/itwinui-react": "^3.4.2", - "@itwin/presentation-hierarchy-builder": "workspace:*", + "@itwin/presentation-hierarchies": "workspace:*", "classnames": "^2.3.2", "immer": "^10.0.3", "react-error-boundary": "^4.0.11", diff --git a/packages/hierarchies-react/src/presentation-hierarchies-react/UseTree.ts b/packages/hierarchies-react/src/presentation-hierarchies-react/UseTree.ts index 981947c01..f9a595bee 100644 --- a/packages/hierarchies-react/src/presentation-hierarchies-react/UseTree.ts +++ b/packages/hierarchies-react/src/presentation-hierarchies-react/UseTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { useCallback, useEffect, useRef, useState } from "react"; -import { GenericInstanceFilter, HierarchyNode, HierarchyProvider } from "@itwin/presentation-hierarchy-builder"; +import { GenericInstanceFilter, HierarchyNode, HierarchyProvider } from "@itwin/presentation-hierarchies"; import { TreeActions, TreeState } from "./internal/TreeActions"; import { isHierarchyNodeSelected, isTreeModelHierarchyNode, TreeModelHierarchyNode, TreeModelRootNode } from "./internal/TreeModel"; import { useUnifiedTreeSelection } from "./internal/UseUnifiedSelection"; diff --git a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeActions.ts b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeActions.ts index 9437a6d49..78a88e6ee 100644 --- a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeActions.ts +++ b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeActions.ts @@ -5,7 +5,7 @@ import { Draft, enableMapSet, produce } from "immer"; import { EMPTY, Observable, reduce, Subject, takeUntil } from "rxjs"; -import { GenericInstanceFilter, HierarchyNode, HierarchyProvider, ParentHierarchyNode } from "@itwin/presentation-hierarchy-builder"; +import { GenericInstanceFilter, HierarchyNode, HierarchyProvider, ParentHierarchyNode } from "@itwin/presentation-hierarchies"; import { PresentationHierarchyNode, PresentationTreeNode } from "../Types"; import { createNodeId, HierarchyLoader, IHierarchyLoader, LoadedHierarchyPart } from "./TreeLoader"; import { diff --git a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeLoader.ts b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeLoader.ts index 3d38a0773..f1e6cb6f8 100644 --- a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeLoader.ts +++ b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeLoader.ts @@ -11,7 +11,7 @@ import { HierarchyProvider, ParentHierarchyNode, RowsLimitExceededError, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; import { isTreeModelHierarchyNode, TreeModelHierarchyNode, TreeModelInfoNode, TreeModelNode, TreeModelRootNode } from "./TreeModel"; /** @internal */ diff --git a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeModel.ts b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeModel.ts index 4a398ea92..d3614ebe3 100644 --- a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeModel.ts +++ b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/TreeModel.ts @@ -3,7 +3,7 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -import { GenericInstanceFilter, HierarchyNode } from "@itwin/presentation-hierarchy-builder"; +import { GenericInstanceFilter, HierarchyNode } from "@itwin/presentation-hierarchies"; import { InfoNodeTypes } from "../Types"; /** @internal */ diff --git a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/UseUnifiedSelection.ts b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/UseUnifiedSelection.ts index 384a9169a..ded24159b 100644 --- a/packages/hierarchies-react/src/presentation-hierarchies-react/internal/UseUnifiedSelection.ts +++ b/packages/hierarchies-react/src/presentation-hierarchies-react/internal/UseUnifiedSelection.ts @@ -5,7 +5,7 @@ import { useCallback } from "react"; import { GroupingNodeKey, InstanceKey, Key, KeySet, PresentationQuery, PresentationQueryBinding, StandardNodeTypes } from "@itwin/presentation-common"; -import { HierarchyNode, parseFullClassName } from "@itwin/presentation-hierarchy-builder"; +import { HierarchyNode, parseFullClassName } from "@itwin/presentation-hierarchies"; import { useUnifiedSelectionContext } from "../UnifiedSelectionContext"; import { serializeNodeKey } from "./TreeLoader"; import { isTreeModelHierarchyNode, TreeModelHierarchyNode, TreeModelRootNode } from "./TreeModel"; diff --git a/packages/hierarchy-builder/.mocharc.json b/packages/hierarchies/.mocharc.json similarity index 100% rename from packages/hierarchy-builder/.mocharc.json rename to packages/hierarchies/.mocharc.json diff --git a/packages/hierarchy-builder/.npmignore b/packages/hierarchies/.npmignore similarity index 100% rename from packages/hierarchy-builder/.npmignore rename to packages/hierarchies/.npmignore diff --git a/packages/hierarchy-builder/.nycrc b/packages/hierarchies/.nycrc similarity index 78% rename from packages/hierarchy-builder/.nycrc rename to packages/hierarchies/.nycrc index 3ed6ef2b7..9ad502fc7 100644 --- a/packages/hierarchy-builder/.nycrc +++ b/packages/hierarchies/.nycrc @@ -6,7 +6,7 @@ "lines": 100, "all": true, "include": ["src/**/*", "lib/cjs/**/*"], - "exclude": ["src/presentation-hierarchy-builder.ts", "src/test/**", "lib/cjs/test/**"], + "exclude": ["src/presentation-hierarchies.ts", "src/test/**", "lib/cjs/test/**"], "extension": [".ts"], "temp-dir": "./lib/test/coverage/.nyc_output", "report-dir": "./lib/test/coverage", diff --git a/packages/hierarchy-builder/api/presentation-hierarchy-builder.api.md b/packages/hierarchies/api/presentation-hierarchies.api.md similarity index 99% rename from packages/hierarchy-builder/api/presentation-hierarchy-builder.api.md rename to packages/hierarchies/api/presentation-hierarchies.api.md index 7a0138179..b6238fc64 100644 --- a/packages/hierarchy-builder/api/presentation-hierarchy-builder.api.md +++ b/packages/hierarchies/api/presentation-hierarchies.api.md @@ -1,4 +1,4 @@ -## API Report File for "@itwin/presentation-hierarchy-builder" +## API Report File for "@itwin/presentation-hierarchies" > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). diff --git a/packages/hierarchy-builder/api/presentation-hierarchy-builder.exports.csv b/packages/hierarchies/api/presentation-hierarchies.exports.csv similarity index 100% rename from packages/hierarchy-builder/api/presentation-hierarchy-builder.exports.csv rename to packages/hierarchies/api/presentation-hierarchies.exports.csv diff --git a/packages/hierarchy-builder/eslint.config.js b/packages/hierarchies/eslint.config.js similarity index 100% rename from packages/hierarchy-builder/eslint.config.js rename to packages/hierarchies/eslint.config.js diff --git a/packages/hierarchy-builder/package.json b/packages/hierarchies/package.json similarity index 77% rename from packages/hierarchy-builder/package.json rename to packages/hierarchies/package.json index 4404e949f..f5c620341 100644 --- a/packages/hierarchy-builder/package.json +++ b/packages/hierarchies/package.json @@ -1,17 +1,18 @@ { - "name": "@itwin/presentation-hierarchy-builder", + "name": "@itwin/presentation-hierarchies", "version": "0.0.0", - "description": "Proof of concept for stateless hierarchy builder", + "description": "A package for creating hierarchies based on data in iTwin.js iModels.", "private": true, "repository": { "type": "git", "url": "https://github.com/iTwin/presentation.git", - "directory": "packages/hierarchy-builder" + "directory": "packages/hierarchies" }, "keywords": [ "Bentley", - "Presentation", "iTwin.js", + "iModels", + "Presentation", "Hierarchy", "ECSQL" ], @@ -19,9 +20,9 @@ "name": "Bentley Systems, Inc.", "url": "http://www.bentley.com" }, - "main": "lib/cjs/presentation-hierarchy-builder.js", - "module": "lib/esm/presentation-hierarchy-builder.js", - "types": "lib/cjs/presentation-hierarchy-builder.d.ts", + "main": "lib/cjs/presentation-hierarchies.js", + "module": "lib/esm/presentation-hierarchies.js", + "types": "lib/cjs/presentation-hierarchies.d.ts", "scripts": { "build": "npm run -s build:cjs && npm run -s build:esm", "build:cjs": "tsc -p tsconfig.cjs.json", @@ -31,8 +32,8 @@ "cover": "nyc npm -s test", "lint": "eslint ./src/**/*.ts", "test": "mocha --config ./.mocharc.json \"./lib/cjs/test/**/*.test.js\"", - "extract-api": "betools extract-api --entry=presentation-hierarchy-builder --apiReportFolder=./api --apiReportTempFolder=./api/temp --apiSummaryFolder=./api", - "check-internal": "node ../../scripts/checkInternal.js --apiSummary ./api/presentation-hierarchy-builder.api.md" + "extract-api": "betools extract-api --entry=presentation-hierarchies --apiReportFolder=./api --apiReportTempFolder=./api/temp --apiSummaryFolder=./api", + "check-internal": "node ../../scripts/checkInternal.js --apiSummary ./api/presentation-hierarchies.api.md" }, "dependencies": { "@itwin/core-bentley": "^4.4.0", diff --git a/packages/hierarchy-builder/src/hierarchy-builder/ECMetadata.ts b/packages/hierarchies/src/hierarchies/ECMetadata.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/ECMetadata.ts rename to packages/hierarchies/src/hierarchies/ECMetadata.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/HierarchyDefinition.ts b/packages/hierarchies/src/hierarchies/HierarchyDefinition.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/HierarchyDefinition.ts rename to packages/hierarchies/src/hierarchies/HierarchyDefinition.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/HierarchyErrors.ts b/packages/hierarchies/src/hierarchies/HierarchyErrors.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/HierarchyErrors.ts rename to packages/hierarchies/src/hierarchies/HierarchyErrors.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/HierarchyNode.ts b/packages/hierarchies/src/hierarchies/HierarchyNode.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/HierarchyNode.ts rename to packages/hierarchies/src/hierarchies/HierarchyNode.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/HierarchyProvider.ts b/packages/hierarchies/src/hierarchies/HierarchyProvider.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/HierarchyProvider.ts rename to packages/hierarchies/src/hierarchies/HierarchyProvider.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/Logging.ts b/packages/hierarchies/src/hierarchies/Logging.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/Logging.ts rename to packages/hierarchies/src/hierarchies/Logging.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/Metadata.ts b/packages/hierarchies/src/hierarchies/Metadata.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/Metadata.ts rename to packages/hierarchies/src/hierarchies/Metadata.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/Utils.ts b/packages/hierarchies/src/hierarchies/Utils.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/Utils.ts rename to packages/hierarchies/src/hierarchies/Utils.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/ChildNodeObservablesCache.ts b/packages/hierarchies/src/hierarchies/internal/ChildNodeObservablesCache.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/ChildNodeObservablesCache.ts rename to packages/hierarchies/src/hierarchies/internal/ChildNodeObservablesCache.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/Common.ts b/packages/hierarchies/src/hierarchies/internal/Common.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/Common.ts rename to packages/hierarchies/src/hierarchies/internal/Common.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/FilteringHierarchyLevelDefinitionsFactory.ts b/packages/hierarchies/src/hierarchies/internal/FilteringHierarchyLevelDefinitionsFactory.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/FilteringHierarchyLevelDefinitionsFactory.ts rename to packages/hierarchies/src/hierarchies/internal/FilteringHierarchyLevelDefinitionsFactory.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/GetClass.ts b/packages/hierarchies/src/hierarchies/internal/GetClass.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/GetClass.ts rename to packages/hierarchies/src/hierarchies/internal/GetClass.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/LoggingUtils.ts b/packages/hierarchies/src/hierarchies/internal/LoggingUtils.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/LoggingUtils.ts rename to packages/hierarchies/src/hierarchies/internal/LoggingUtils.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/Rxjs.ts b/packages/hierarchies/src/hierarchies/internal/Rxjs.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/Rxjs.ts rename to packages/hierarchies/src/hierarchies/internal/Rxjs.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/SubscriptionScheduler.ts b/packages/hierarchies/src/hierarchies/internal/SubscriptionScheduler.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/SubscriptionScheduler.ts rename to packages/hierarchies/src/hierarchies/internal/SubscriptionScheduler.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/TreeNodesReader.ts b/packages/hierarchies/src/hierarchies/internal/TreeNodesReader.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/TreeNodesReader.ts rename to packages/hierarchies/src/hierarchies/internal/TreeNodesReader.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/DetermineChildren.ts b/packages/hierarchies/src/hierarchies/internal/operators/DetermineChildren.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/DetermineChildren.ts rename to packages/hierarchies/src/hierarchies/internal/operators/DetermineChildren.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/Grouping.ts b/packages/hierarchies/src/hierarchies/internal/operators/Grouping.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/Grouping.ts rename to packages/hierarchies/src/hierarchies/internal/operators/Grouping.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/HideIfNoChildren.ts b/packages/hierarchies/src/hierarchies/internal/operators/HideIfNoChildren.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/HideIfNoChildren.ts rename to packages/hierarchies/src/hierarchies/internal/operators/HideIfNoChildren.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/HideNodesInHierarchy.ts b/packages/hierarchies/src/hierarchies/internal/operators/HideNodesInHierarchy.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/HideNodesInHierarchy.ts rename to packages/hierarchies/src/hierarchies/internal/operators/HideNodesInHierarchy.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/Sorting.ts b/packages/hierarchies/src/hierarchies/internal/operators/Sorting.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/Sorting.ts rename to packages/hierarchies/src/hierarchies/internal/operators/Sorting.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/AutoExpand.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/AutoExpand.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/AutoExpand.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/AutoExpand.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/BaseClassGrouping.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/BaseClassGrouping.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/BaseClassGrouping.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/BaseClassGrouping.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/ClassGrouping.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/ClassGrouping.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/ClassGrouping.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/ClassGrouping.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/GroupHiding.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/GroupHiding.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/GroupHiding.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/GroupHiding.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/LabelGrouping.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/LabelGrouping.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/LabelGrouping.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/LabelGrouping.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/PropertiesGrouping.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/PropertiesGrouping.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/PropertiesGrouping.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/PropertiesGrouping.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/Shared.ts b/packages/hierarchies/src/hierarchies/internal/operators/grouping/Shared.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/internal/operators/grouping/Shared.ts rename to packages/hierarchies/src/hierarchies/internal/operators/grouping/Shared.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/ECSqlCore.ts b/packages/hierarchies/src/hierarchies/queries/ECSqlCore.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/ECSqlCore.ts rename to packages/hierarchies/src/hierarchies/queries/ECSqlCore.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/InstanceLabelSelectClauseFactory.ts b/packages/hierarchies/src/hierarchies/queries/InstanceLabelSelectClauseFactory.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/InstanceLabelSelectClauseFactory.ts rename to packages/hierarchies/src/hierarchies/queries/InstanceLabelSelectClauseFactory.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/LimitingECSqlQueryExecutor.ts b/packages/hierarchies/src/hierarchies/queries/LimitingECSqlQueryExecutor.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/LimitingECSqlQueryExecutor.ts rename to packages/hierarchies/src/hierarchies/queries/LimitingECSqlQueryExecutor.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/NodeSelectQueryFactory.ts b/packages/hierarchies/src/hierarchies/queries/NodeSelectQueryFactory.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/NodeSelectQueryFactory.ts rename to packages/hierarchies/src/hierarchies/queries/NodeSelectQueryFactory.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/ecsql-snippets/ECSqlJoinSnippets.ts b/packages/hierarchies/src/hierarchies/queries/ecsql-snippets/ECSqlJoinSnippets.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/ecsql-snippets/ECSqlJoinSnippets.ts rename to packages/hierarchies/src/hierarchies/queries/ecsql-snippets/ECSqlJoinSnippets.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/queries/ecsql-snippets/ECSqlValueSelectorSnippets.ts b/packages/hierarchies/src/hierarchies/queries/ecsql-snippets/ECSqlValueSelectorSnippets.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/queries/ecsql-snippets/ECSqlValueSelectorSnippets.ts rename to packages/hierarchies/src/hierarchies/queries/ecsql-snippets/ECSqlValueSelectorSnippets.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/values/ConcatenatedValue.ts b/packages/hierarchies/src/hierarchies/values/ConcatenatedValue.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/values/ConcatenatedValue.ts rename to packages/hierarchies/src/hierarchies/values/ConcatenatedValue.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/values/Formatting.ts b/packages/hierarchies/src/hierarchies/values/Formatting.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/values/Formatting.ts rename to packages/hierarchies/src/hierarchies/values/Formatting.ts diff --git a/packages/hierarchy-builder/src/hierarchy-builder/values/Values.ts b/packages/hierarchies/src/hierarchies/values/Values.ts similarity index 100% rename from packages/hierarchy-builder/src/hierarchy-builder/values/Values.ts rename to packages/hierarchies/src/hierarchies/values/Values.ts diff --git a/packages/hierarchy-builder/src/presentation-hierarchy-builder.ts b/packages/hierarchies/src/presentation-hierarchies.ts similarity index 50% rename from packages/hierarchy-builder/src/presentation-hierarchy-builder.ts rename to packages/hierarchies/src/presentation-hierarchies.ts index e03525828..177b5c61e 100644 --- a/packages/hierarchy-builder/src/presentation-hierarchy-builder.ts +++ b/packages/hierarchies/src/presentation-hierarchies.ts @@ -3,8 +3,8 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -import * as ECSqlJoinSnippets from "./hierarchy-builder/queries/ecsql-snippets/ECSqlJoinSnippets"; -import * as ECSqlValueSnippets from "./hierarchy-builder/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; +import * as ECSqlJoinSnippets from "./hierarchies/queries/ecsql-snippets/ECSqlJoinSnippets"; +import * as ECSqlValueSnippets from "./hierarchies/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; /** * Provides a set of helper functions to create ECSQL snippets. @@ -27,18 +27,18 @@ export { GenericInstanceFilterRelationshipStep, } from "@itwin/core-common"; -export * from "./hierarchy-builder/ECMetadata"; -export * from "./hierarchy-builder/HierarchyDefinition"; -export * from "./hierarchy-builder/HierarchyErrors"; -export * from "./hierarchy-builder/HierarchyNode"; -export * from "./hierarchy-builder/HierarchyProvider"; -export * from "./hierarchy-builder/Logging"; -export * from "./hierarchy-builder/Metadata"; -export { OmitOverUnion } from "./hierarchy-builder/Utils"; -export * from "./hierarchy-builder/queries/ECSqlCore"; -export * from "./hierarchy-builder/queries/InstanceLabelSelectClauseFactory"; -export { createLimitingECSqlQueryExecutor, ILimitingECSqlQueryExecutor } from "./hierarchy-builder/queries/LimitingECSqlQueryExecutor"; -export * from "./hierarchy-builder/queries/NodeSelectQueryFactory"; -export * from "./hierarchy-builder/values/ConcatenatedValue"; -export * from "./hierarchy-builder/values/Formatting"; -export * from "./hierarchy-builder/values/Values"; +export * from "./hierarchies/ECMetadata"; +export * from "./hierarchies/HierarchyDefinition"; +export * from "./hierarchies/HierarchyErrors"; +export * from "./hierarchies/HierarchyNode"; +export * from "./hierarchies/HierarchyProvider"; +export * from "./hierarchies/Logging"; +export * from "./hierarchies/Metadata"; +export { OmitOverUnion } from "./hierarchies/Utils"; +export * from "./hierarchies/queries/ECSqlCore"; +export * from "./hierarchies/queries/InstanceLabelSelectClauseFactory"; +export { createLimitingECSqlQueryExecutor, ILimitingECSqlQueryExecutor } from "./hierarchies/queries/LimitingECSqlQueryExecutor"; +export * from "./hierarchies/queries/NodeSelectQueryFactory"; +export * from "./hierarchies/values/ConcatenatedValue"; +export * from "./hierarchies/values/Formatting"; +export * from "./hierarchies/values/Values"; diff --git a/packages/hierarchy-builder/src/test/HierarchyDefinition.test.ts b/packages/hierarchies/src/test/HierarchyDefinition.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/HierarchyDefinition.test.ts rename to packages/hierarchies/src/test/HierarchyDefinition.test.ts index 87da1c80f..3cc1b2544 100644 --- a/packages/hierarchy-builder/src/test/HierarchyDefinition.test.ts +++ b/packages/hierarchies/src/test/HierarchyDefinition.test.ts @@ -5,7 +5,7 @@ import { expect } from "chai"; import sinon from "sinon"; -import { IMetadataProvider } from "../hierarchy-builder/ECMetadata"; +import { IMetadataProvider } from "../hierarchies/ECMetadata"; import { ClassBasedHierarchyLevelDefinitionsFactory, CustomHierarchyNodeDefinition, @@ -13,7 +13,7 @@ import { HierarchyLevelDefinition, HierarchyNodesDefinition, InstanceNodesQueryDefinition, -} from "../hierarchy-builder/HierarchyDefinition"; +} from "../hierarchies/HierarchyDefinition"; import { ClassStubs, createClassStubs, createTestParsedCustomNode } from "./Utils"; describe("HierarchyNodesDefinition", () => { diff --git a/packages/hierarchy-builder/src/test/HierarchyNode.test.ts b/packages/hierarchies/src/test/HierarchyNode.test.ts similarity index 99% rename from packages/hierarchy-builder/src/test/HierarchyNode.test.ts rename to packages/hierarchies/src/test/HierarchyNode.test.ts index b81c281f3..4a779977d 100644 --- a/packages/hierarchy-builder/src/test/HierarchyNode.test.ts +++ b/packages/hierarchies/src/test/HierarchyNode.test.ts @@ -11,8 +11,8 @@ import { HierarchyNodeKey, PropertyValueGroupingNodeKey, PropertyValueRangeGroupingNodeKey, -} from "../hierarchy-builder/HierarchyNode"; -import { InstanceKey } from "../hierarchy-builder/values/Values"; +} from "../hierarchies/HierarchyNode"; +import { InstanceKey } from "../hierarchies/values/Values"; describe("HierarchyNodeKey", () => { describe("equals", () => { diff --git a/packages/hierarchy-builder/src/test/HierarchyProvider.test.ts b/packages/hierarchies/src/test/HierarchyProvider.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/HierarchyProvider.test.ts rename to packages/hierarchies/src/test/HierarchyProvider.test.ts index 355fccef2..2c7d39a9a 100644 --- a/packages/hierarchy-builder/src/test/HierarchyProvider.test.ts +++ b/packages/hierarchies/src/test/HierarchyProvider.test.ts @@ -7,22 +7,22 @@ import { expect } from "chai"; import sinon from "sinon"; import { omit } from "@itwin/core-bentley"; import { GenericInstanceFilter } from "@itwin/core-common"; -import { ECKindOfQuantity, ECPrimitiveProperty, ECProperty, IMetadataProvider } from "../hierarchy-builder/ECMetadata"; -import { IHierarchyLevelDefinitionsFactory } from "../hierarchy-builder/HierarchyDefinition"; -import { RowsLimitExceededError } from "../hierarchy-builder/HierarchyErrors"; -import { GroupingHierarchyNode, GroupingNodeKey, HierarchyNode, ParsedCustomHierarchyNode } from "../hierarchy-builder/HierarchyNode"; -import { HierarchyProvider } from "../hierarchy-builder/HierarchyProvider"; +import { ECKindOfQuantity, ECPrimitiveProperty, ECProperty, IMetadataProvider } from "../hierarchies/ECMetadata"; +import { IHierarchyLevelDefinitionsFactory } from "../hierarchies/HierarchyDefinition"; +import { RowsLimitExceededError } from "../hierarchies/HierarchyErrors"; +import { GroupingHierarchyNode, GroupingNodeKey, HierarchyNode, ParsedCustomHierarchyNode } from "../hierarchies/HierarchyNode"; +import { HierarchyProvider } from "../hierarchies/HierarchyProvider"; import { ECSQL_COLUMN_NAME_FilteredChildrenPaths, ECSQL_COLUMN_NAME_IsFilterTarget, FilteredHierarchyNode, -} from "../hierarchy-builder/internal/FilteringHierarchyLevelDefinitionsFactory"; -import { RowDef } from "../hierarchy-builder/internal/TreeNodesReader"; -import { ECSqlQueryDef, ECSqlQueryReader, ECSqlQueryReaderOptions } from "../hierarchy-builder/queries/ECSqlCore"; -import { ECSqlSelectClauseGroupingParams, NodeSelectClauseColumnNames } from "../hierarchy-builder/queries/NodeSelectQueryFactory"; -import { trimWhitespace } from "../hierarchy-builder/Utils"; -import { ConcatenatedValue } from "../hierarchy-builder/values/ConcatenatedValue"; -import { TypedPrimitiveValue } from "../hierarchy-builder/values/Values"; +} from "../hierarchies/internal/FilteringHierarchyLevelDefinitionsFactory"; +import { RowDef } from "../hierarchies/internal/TreeNodesReader"; +import { ECSqlQueryDef, ECSqlQueryReader, ECSqlQueryReaderOptions } from "../hierarchies/queries/ECSqlCore"; +import { ECSqlSelectClauseGroupingParams, NodeSelectClauseColumnNames } from "../hierarchies/queries/NodeSelectQueryFactory"; +import { trimWhitespace } from "../hierarchies/Utils"; +import { ConcatenatedValue } from "../hierarchies/values/ConcatenatedValue"; +import { TypedPrimitiveValue } from "../hierarchies/values/Values"; import { ClassStubs, createClassStubs, createFakeQueryReader, ResolvablePromise, waitFor } from "./Utils"; describe("HierarchyProvider", () => { diff --git a/packages/hierarchy-builder/src/test/Logging.test.ts b/packages/hierarchies/src/test/Logging.test.ts similarity index 87% rename from packages/hierarchy-builder/src/test/Logging.test.ts rename to packages/hierarchies/src/test/Logging.test.ts index 66502ef84..e1bb861e1 100644 --- a/packages/hierarchy-builder/src/test/Logging.test.ts +++ b/packages/hierarchies/src/test/Logging.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { getLogger, ILogger, setLogger } from "../hierarchy-builder/Logging"; +import { getLogger, ILogger, setLogger } from "../hierarchies/Logging"; describe("getLogger", () => { it("returns custom logger", () => { diff --git a/packages/hierarchy-builder/src/test/Utils.ts b/packages/hierarchies/src/test/Utils.ts similarity index 95% rename from packages/hierarchy-builder/src/test/Utils.ts rename to packages/hierarchies/src/test/Utils.ts index 9846bce59..c889e5cce 100644 --- a/packages/hierarchy-builder/src/test/Utils.ts +++ b/packages/hierarchies/src/test/Utils.ts @@ -6,19 +6,19 @@ import { Observable } from "rxjs"; import sinon from "sinon"; import { BeDuration, Logger, LogLevel, StopWatch } from "@itwin/core-bentley"; -import { ECClass, ECEntityClass, ECProperty, ECRelationshipClass, ECRelationshipConstraint, IMetadataProvider } from "../hierarchy-builder/ECMetadata"; +import { ECClass, ECEntityClass, ECProperty, ECRelationshipClass, ECRelationshipConstraint, IMetadataProvider } from "../hierarchies/ECMetadata"; import { ParsedCustomHierarchyNode, ParsedInstanceHierarchyNode, ProcessedCustomHierarchyNode, ProcessedGroupingHierarchyNode, ProcessedInstanceHierarchyNode, -} from "../hierarchy-builder/HierarchyNode"; -import { HierarchyProviderLocalizedStrings } from "../hierarchy-builder/HierarchyProvider"; -import * as getClass from "../hierarchy-builder/internal/GetClass"; -import { parseFullClassName } from "../hierarchy-builder/Metadata"; -import { ECSqlQueryReader } from "../hierarchy-builder/queries/ECSqlCore"; -import { InstanceKey } from "../hierarchy-builder/values/Values"; +} from "../hierarchies/HierarchyNode"; +import { HierarchyProviderLocalizedStrings } from "../hierarchies/HierarchyProvider"; +import * as getClass from "../hierarchies/internal/GetClass"; +import { parseFullClassName } from "../hierarchies/Metadata"; +import { ECSqlQueryReader } from "../hierarchies/queries/ECSqlCore"; +import { InstanceKey } from "../hierarchies/values/Values"; export function setupLogging(levels: Array<{ namespace: string; level: LogLevel }>) { Logger.initializeToConsole(); diff --git a/packages/hierarchy-builder/src/test/index.ts b/packages/hierarchies/src/test/index.ts similarity index 100% rename from packages/hierarchy-builder/src/test/index.ts rename to packages/hierarchies/src/test/index.ts diff --git a/packages/hierarchy-builder/src/test/internal/ChildNodeObservablesCache.test.ts b/packages/hierarchies/src/test/internal/ChildNodeObservablesCache.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/ChildNodeObservablesCache.test.ts rename to packages/hierarchies/src/test/internal/ChildNodeObservablesCache.test.ts index eff8cb7cb..f6f65cc95 100644 --- a/packages/hierarchy-builder/src/test/internal/ChildNodeObservablesCache.test.ts +++ b/packages/hierarchies/src/test/internal/ChildNodeObservablesCache.test.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { GetHierarchyNodesProps } from "../../hierarchy-builder/HierarchyProvider"; -import { ChildNodeObservablesCache, ParsedQueryNodesObservable, ProcessedNodesObservable } from "../../hierarchy-builder/internal/ChildNodeObservablesCache"; +import { GetHierarchyNodesProps } from "../../hierarchies/HierarchyProvider"; +import { ChildNodeObservablesCache, ParsedQueryNodesObservable, ProcessedNodesObservable } from "../../hierarchies/internal/ChildNodeObservablesCache"; import { createTestProcessedCustomNode, createTestProcessedGroupingNode } from "../Utils"; describe("ChildNodeObservablesCache", () => { diff --git a/packages/hierarchy-builder/src/test/internal/Common.test.ts b/packages/hierarchies/src/test/internal/Common.test.ts similarity index 99% rename from packages/hierarchy-builder/src/test/internal/Common.test.ts rename to packages/hierarchies/src/test/internal/Common.test.ts index 6cbec71a7..a7869d352 100644 --- a/packages/hierarchy-builder/src/test/internal/Common.test.ts +++ b/packages/hierarchies/src/test/internal/Common.test.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { InstanceHierarchyNodeProcessingParams } from "../../hierarchy-builder/HierarchyNode"; -import { hasChildren, mergeNodes } from "../../hierarchy-builder/internal/Common"; +import { InstanceHierarchyNodeProcessingParams } from "../../hierarchies/HierarchyNode"; +import { hasChildren, mergeNodes } from "../../hierarchies/internal/Common"; import { createTestProcessedCustomNode, createTestProcessedInstanceNode } from "../Utils"; describe("mergeNodes", () => { diff --git a/packages/hierarchy-builder/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts b/packages/hierarchies/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts rename to packages/hierarchies/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts index 8c02e4f44..a9934aeed 100644 --- a/packages/hierarchy-builder/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts +++ b/packages/hierarchies/src/test/internal/FilteringHierarchyLevelDefinitionsFactory.test.ts @@ -5,25 +5,25 @@ import { expect } from "chai"; import sinon from "sinon"; -import { IMetadataProvider } from "../../hierarchy-builder/ECMetadata"; +import { IMetadataProvider } from "../../hierarchies/ECMetadata"; import { CustomHierarchyNodeDefinition, HierarchyDefinitionParentNode, HierarchyLevelDefinition, IHierarchyLevelDefinitionsFactory, InstanceNodesQueryDefinition, -} from "../../hierarchy-builder/HierarchyDefinition"; -import { HierarchyNode, HierarchyNodeIdentifiersPath, ParsedCustomHierarchyNode, ParsedHierarchyNode } from "../../hierarchy-builder/HierarchyNode"; +} from "../../hierarchies/HierarchyDefinition"; +import { HierarchyNode, HierarchyNodeIdentifiersPath, ParsedCustomHierarchyNode, ParsedHierarchyNode } from "../../hierarchies/HierarchyNode"; import { applyECInstanceIdsFilter, ECSQL_COLUMN_NAME_FilteredChildrenPaths, ECSQL_COLUMN_NAME_IsFilterTarget, FilteredHierarchyNode, FilteringHierarchyLevelDefinitionsFactory, -} from "../../hierarchy-builder/internal/FilteringHierarchyLevelDefinitionsFactory"; -import * as reader from "../../hierarchy-builder/internal/TreeNodesReader"; -import { NodeSelectClauseColumnNames } from "../../hierarchy-builder/queries/NodeSelectQueryFactory"; -import { trimWhitespace } from "../../hierarchy-builder/Utils"; +} from "../../hierarchies/internal/FilteringHierarchyLevelDefinitionsFactory"; +import * as reader from "../../hierarchies/internal/TreeNodesReader"; +import { NodeSelectClauseColumnNames } from "../../hierarchies/queries/NodeSelectQueryFactory"; +import { trimWhitespace } from "../../hierarchies/Utils"; import { ClassStubs, createClassStubs, diff --git a/packages/hierarchy-builder/src/test/internal/GetClass.test.ts b/packages/hierarchies/src/test/internal/GetClass.test.ts similarity index 96% rename from packages/hierarchy-builder/src/test/internal/GetClass.test.ts rename to packages/hierarchies/src/test/internal/GetClass.test.ts index 4ec20645f..48b163c30 100644 --- a/packages/hierarchy-builder/src/test/internal/GetClass.test.ts +++ b/packages/hierarchies/src/test/internal/GetClass.test.ts @@ -5,7 +5,7 @@ import { expect } from "chai"; import sinon from "sinon"; -import { getClass } from "../../hierarchy-builder/internal/GetClass"; +import { getClass } from "../../hierarchies/internal/GetClass"; describe("getClass", () => { const metadata = { diff --git a/packages/hierarchy-builder/src/test/internal/LimitingECSqlQueryExecutor.test.ts b/packages/hierarchies/src/test/internal/LimitingECSqlQueryExecutor.test.ts similarity index 92% rename from packages/hierarchy-builder/src/test/internal/LimitingECSqlQueryExecutor.test.ts rename to packages/hierarchies/src/test/internal/LimitingECSqlQueryExecutor.test.ts index b5706d666..0eba21387 100644 --- a/packages/hierarchy-builder/src/test/internal/LimitingECSqlQueryExecutor.test.ts +++ b/packages/hierarchies/src/test/internal/LimitingECSqlQueryExecutor.test.ts @@ -5,10 +5,10 @@ import { expect } from "chai"; import sinon from "sinon"; -import { RowsLimitExceededError } from "../../hierarchy-builder/HierarchyErrors"; -import { IECSqlQueryExecutor } from "../../hierarchy-builder/queries/ECSqlCore"; -import { createLimitingECSqlQueryExecutor } from "../../hierarchy-builder/queries/LimitingECSqlQueryExecutor"; -import { trimWhitespace } from "../../hierarchy-builder/Utils"; +import { RowsLimitExceededError } from "../../hierarchies/HierarchyErrors"; +import { IECSqlQueryExecutor } from "../../hierarchies/queries/ECSqlCore"; +import { createLimitingECSqlQueryExecutor } from "../../hierarchies/queries/LimitingECSqlQueryExecutor"; +import { trimWhitespace } from "../../hierarchies/Utils"; import { createFakeQueryReader, toArray } from "../Utils"; describe("createLimitingECSqlQueryExecutor", () => { diff --git a/packages/hierarchy-builder/src/test/internal/LoggingUtils.test.ts b/packages/hierarchies/src/test/internal/LoggingUtils.test.ts similarity index 96% rename from packages/hierarchy-builder/src/test/internal/LoggingUtils.test.ts rename to packages/hierarchies/src/test/internal/LoggingUtils.test.ts index 8a0ec9392..78edf3e77 100644 --- a/packages/hierarchy-builder/src/test/internal/LoggingUtils.test.ts +++ b/packages/hierarchies/src/test/internal/LoggingUtils.test.ts @@ -6,8 +6,8 @@ import { expect } from "chai"; import { of } from "rxjs"; import sinon from "sinon"; -import { doLog, log } from "../../hierarchy-builder/internal/LoggingUtils"; -import { ILogger, LogLevel, setLogger } from "../../hierarchy-builder/Logging"; +import { doLog, log } from "../../hierarchies/internal/LoggingUtils"; +import { ILogger, LogLevel, setLogger } from "../../hierarchies/Logging"; describe("LoggingUtils", () => { let logger: sinon.SinonStubbedInstance; diff --git a/packages/hierarchy-builder/src/test/internal/SubscriptionScheduler.test.ts b/packages/hierarchies/src/test/internal/SubscriptionScheduler.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/SubscriptionScheduler.test.ts rename to packages/hierarchies/src/test/internal/SubscriptionScheduler.test.ts index 1ccff7247..67ad7f366 100644 --- a/packages/hierarchy-builder/src/test/internal/SubscriptionScheduler.test.ts +++ b/packages/hierarchies/src/test/internal/SubscriptionScheduler.test.ts @@ -18,7 +18,7 @@ import { throwError, } from "rxjs"; import sinon from "sinon"; -import { SubscriptionScheduler } from "../../hierarchy-builder/internal/SubscriptionScheduler"; +import { SubscriptionScheduler } from "../../hierarchies/internal/SubscriptionScheduler"; import { ResolvablePromise } from "../Utils"; describe("SubscriptionScheduler", () => { diff --git a/packages/hierarchy-builder/src/test/internal/TreeNodesReader.test.ts b/packages/hierarchies/src/test/internal/TreeNodesReader.test.ts similarity index 94% rename from packages/hierarchy-builder/src/test/internal/TreeNodesReader.test.ts rename to packages/hierarchies/src/test/internal/TreeNodesReader.test.ts index 592b1be64..2d2b9d853 100644 --- a/packages/hierarchy-builder/src/test/internal/TreeNodesReader.test.ts +++ b/packages/hierarchies/src/test/internal/TreeNodesReader.test.ts @@ -5,11 +5,11 @@ import { expect } from "chai"; import sinon from "sinon"; -import { ParsedHierarchyNode, ParsedInstanceHierarchyNode } from "../../hierarchy-builder/HierarchyNode"; -import { defaultNodesParser, RowDef, TreeQueryResultsReader } from "../../hierarchy-builder/internal/TreeNodesReader"; -import { ILimitingECSqlQueryExecutor } from "../../hierarchy-builder/queries/LimitingECSqlQueryExecutor"; -import { NodeSelectClauseColumnNames } from "../../hierarchy-builder/queries/NodeSelectQueryFactory"; -import { ConcatenatedValue } from "../../hierarchy-builder/values/ConcatenatedValue"; +import { ParsedHierarchyNode, ParsedInstanceHierarchyNode } from "../../hierarchies/HierarchyNode"; +import { defaultNodesParser, RowDef, TreeQueryResultsReader } from "../../hierarchies/internal/TreeNodesReader"; +import { ILimitingECSqlQueryExecutor } from "../../hierarchies/queries/LimitingECSqlQueryExecutor"; +import { NodeSelectClauseColumnNames } from "../../hierarchies/queries/NodeSelectQueryFactory"; +import { ConcatenatedValue } from "../../hierarchies/values/ConcatenatedValue"; import { createFakeQueryReader, createTestParsedInstanceNode, toArray } from "../Utils"; describe("TreeQueryResultsReader", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/DetermineChildren.test.ts b/packages/hierarchies/src/test/internal/operators/DetermineChildren.test.ts similarity index 94% rename from packages/hierarchy-builder/src/test/internal/operators/DetermineChildren.test.ts rename to packages/hierarchies/src/test/internal/operators/DetermineChildren.test.ts index d17b8eb53..ec0b4bc47 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/DetermineChildren.test.ts +++ b/packages/hierarchies/src/test/internal/operators/DetermineChildren.test.ts @@ -7,8 +7,8 @@ import { expect } from "chai"; import { delay, from, Observable, of } from "rxjs"; import sinon from "sinon"; import { LogLevel } from "@itwin/core-bentley"; -import { ProcessedHierarchyNode } from "../../../hierarchy-builder/HierarchyNode"; -import { createDetermineChildrenOperator, LOGGING_NAMESPACE } from "../../../hierarchy-builder/internal/operators/DetermineChildren"; +import { ProcessedHierarchyNode } from "../../../hierarchies/HierarchyNode"; +import { createDetermineChildrenOperator, LOGGING_NAMESPACE } from "../../../hierarchies/internal/operators/DetermineChildren"; import { createTestProcessedCustomNode, getObservableResult, setupLogging } from "../../Utils"; describe("DetermineChildren", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/Grouping.test.ts b/packages/hierarchies/src/test/internal/operators/Grouping.test.ts similarity index 93% rename from packages/hierarchy-builder/src/test/internal/operators/Grouping.test.ts rename to packages/hierarchies/src/test/internal/operators/Grouping.test.ts index abf000902..9d36fdce6 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/Grouping.test.ts +++ b/packages/hierarchies/src/test/internal/operators/Grouping.test.ts @@ -7,21 +7,16 @@ import { expect } from "chai"; import { from } from "rxjs"; import sinon from "sinon"; import { LogLevel } from "@itwin/core-bentley"; -import { IMetadataProvider } from "../../../hierarchy-builder/ECMetadata"; -import { ProcessedInstanceHierarchyNode } from "../../../hierarchy-builder/HierarchyNode"; -import { - createGroupingHandlers, - createGroupingOperator, - GroupingHandlerResult, - LOGGING_NAMESPACE, -} from "../../../hierarchy-builder/internal/operators/Grouping"; -import * as autoExpand from "../../../hierarchy-builder/internal/operators/grouping/AutoExpand"; -import * as baseClassGrouping from "../../../hierarchy-builder/internal/operators/grouping/BaseClassGrouping"; -import * as classGrouping from "../../../hierarchy-builder/internal/operators/grouping/ClassGrouping"; -import * as groupHiding from "../../../hierarchy-builder/internal/operators/grouping/GroupHiding"; -import * as labelGrouping from "../../../hierarchy-builder/internal/operators/grouping/LabelGrouping"; -import * as propertiesGrouping from "../../../hierarchy-builder/internal/operators/grouping/PropertiesGrouping"; -import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../../hierarchy-builder/values/Formatting"; +import { IMetadataProvider } from "../../../hierarchies/ECMetadata"; +import { ProcessedInstanceHierarchyNode } from "../../../hierarchies/HierarchyNode"; +import { createGroupingHandlers, createGroupingOperator, GroupingHandlerResult, LOGGING_NAMESPACE } from "../../../hierarchies/internal/operators/Grouping"; +import * as autoExpand from "../../../hierarchies/internal/operators/grouping/AutoExpand"; +import * as baseClassGrouping from "../../../hierarchies/internal/operators/grouping/BaseClassGrouping"; +import * as classGrouping from "../../../hierarchies/internal/operators/grouping/ClassGrouping"; +import * as groupHiding from "../../../hierarchies/internal/operators/grouping/GroupHiding"; +import * as labelGrouping from "../../../hierarchies/internal/operators/grouping/LabelGrouping"; +import * as propertiesGrouping from "../../../hierarchies/internal/operators/grouping/PropertiesGrouping"; +import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../../hierarchies/values/Formatting"; import { createTestProcessedGroupingNode, createTestProcessedInstanceNode, getObservableResult, setupLogging, testLocalizedStrings } from "../../Utils"; describe("Grouping", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/HideIfNoChildren.test.ts b/packages/hierarchies/src/test/internal/operators/HideIfNoChildren.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/operators/HideIfNoChildren.test.ts rename to packages/hierarchies/src/test/internal/operators/HideIfNoChildren.test.ts index c79013538..d5e0a5f63 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/HideIfNoChildren.test.ts +++ b/packages/hierarchies/src/test/internal/operators/HideIfNoChildren.test.ts @@ -6,7 +6,7 @@ import { expect } from "chai"; import { EMPTY, from, of, Subject } from "rxjs"; import sinon from "sinon"; import { LogLevel } from "@itwin/core-bentley"; -import { createHideIfNoChildrenOperator, LOGGING_NAMESPACE } from "../../../hierarchy-builder/internal/operators/HideIfNoChildren"; +import { createHideIfNoChildrenOperator, LOGGING_NAMESPACE } from "../../../hierarchies/internal/operators/HideIfNoChildren"; import { createTestProcessedCustomNode, getObservableResult, setupLogging, waitFor } from "../../Utils"; describe("HideIfNoChildrenOperator", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/HideNodesInHierarchy.test.ts b/packages/hierarchies/src/test/internal/operators/HideNodesInHierarchy.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/operators/HideNodesInHierarchy.test.ts rename to packages/hierarchies/src/test/internal/operators/HideNodesInHierarchy.test.ts index 105b3f7b6..d480c0af7 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/HideNodesInHierarchy.test.ts +++ b/packages/hierarchies/src/test/internal/operators/HideNodesInHierarchy.test.ts @@ -7,8 +7,8 @@ import { expect } from "chai"; import { from } from "rxjs"; import sinon from "sinon"; import { LogLevel } from "@itwin/core-bentley"; -import { ProcessedHierarchyNode } from "../../../hierarchy-builder/HierarchyNode"; -import { createHideNodesInHierarchyOperator, LOGGING_NAMESPACE } from "../../../hierarchy-builder/internal/operators/HideNodesInHierarchy"; +import { ProcessedHierarchyNode } from "../../../hierarchies/HierarchyNode"; +import { createHideNodesInHierarchyOperator, LOGGING_NAMESPACE } from "../../../hierarchies/internal/operators/HideNodesInHierarchy"; import { createTestInstanceKey, createTestProcessedCustomNode, createTestProcessedInstanceNode, getObservableResult, setupLogging, waitFor } from "../../Utils"; describe("HideNodesInHierarchyOperator", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/AutoExpand.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/AutoExpand.test.ts similarity index 95% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/AutoExpand.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/AutoExpand.test.ts index 76ca57c31..9bb5633a0 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/AutoExpand.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/AutoExpand.test.ts @@ -4,14 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { - GroupingNodeKey, - HierarchyNode, - HierarchyNodeAutoExpandProp, - InstanceHierarchyNodeProcessingParams, -} from "../../../../hierarchy-builder/HierarchyNode"; -import { GroupingType, ProcessedInstancesGroupingHierarchyNode } from "../../../../hierarchy-builder/internal/operators/Grouping"; -import { assignAutoExpand } from "../../../../hierarchy-builder/internal/operators/grouping/AutoExpand"; +import { GroupingNodeKey, HierarchyNode, HierarchyNodeAutoExpandProp, InstanceHierarchyNodeProcessingParams } from "../../../../hierarchies/HierarchyNode"; +import { GroupingType, ProcessedInstancesGroupingHierarchyNode } from "../../../../hierarchies/internal/operators/Grouping"; +import { assignAutoExpand } from "../../../../hierarchies/internal/operators/grouping/AutoExpand"; import { createTestProcessedGroupingNode, createTestProcessedInstanceNode } from "../../../Utils"; describe("AutoExpand", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/BaseClassGrouping.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/BaseClassGrouping.test.ts similarity index 97% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/BaseClassGrouping.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/BaseClassGrouping.test.ts index 224180278..25db2ef7d 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/BaseClassGrouping.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/BaseClassGrouping.test.ts @@ -5,10 +5,10 @@ import { expect } from "chai"; import sinon from "sinon"; -import { ECClass, IMetadataProvider } from "../../../../hierarchy-builder/ECMetadata"; -import { GroupingNodeKey } from "../../../../hierarchy-builder/HierarchyNode"; -import { BaseClassChecker } from "../../../../hierarchy-builder/internal/Common"; -import * as baseClassGrouping from "../../../../hierarchy-builder/internal/operators/grouping/BaseClassGrouping"; +import { ECClass, IMetadataProvider } from "../../../../hierarchies/ECMetadata"; +import { GroupingNodeKey } from "../../../../hierarchies/HierarchyNode"; +import { BaseClassChecker } from "../../../../hierarchies/internal/Common"; +import * as baseClassGrouping from "../../../../hierarchies/internal/operators/grouping/BaseClassGrouping"; import { ClassStubs, createClassStubs, createTestProcessedGroupingNode, createTestProcessedInstanceNode } from "../../../Utils"; describe("BaseClassGrouping", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/ClassGrouping.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/ClassGrouping.test.ts similarity index 93% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/ClassGrouping.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/ClassGrouping.test.ts index eb7b10301..ace039d92 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/ClassGrouping.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/ClassGrouping.test.ts @@ -5,10 +5,10 @@ import { expect } from "chai"; import sinon from "sinon"; -import { IMetadataProvider } from "../../../../hierarchy-builder/ECMetadata"; -import { GroupingNodeKey } from "../../../../hierarchy-builder/HierarchyNode"; -import { GroupingHandlerResult } from "../../../../hierarchy-builder/internal/operators/Grouping"; -import { createClassGroups } from "../../../../hierarchy-builder/internal/operators/grouping/ClassGrouping"; +import { IMetadataProvider } from "../../../../hierarchies/ECMetadata"; +import { GroupingNodeKey } from "../../../../hierarchies/HierarchyNode"; +import { GroupingHandlerResult } from "../../../../hierarchies/internal/operators/Grouping"; +import { createClassGroups } from "../../../../hierarchies/internal/operators/grouping/ClassGrouping"; import { ClassStubs, createClassStubs, createTestProcessedInstanceNode } from "../../../Utils"; describe("ClassGrouping", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/GroupHiding.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/GroupHiding.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/GroupHiding.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/GroupHiding.test.ts index 7f388aa00..1d32b1d3f 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/GroupHiding.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/GroupHiding.test.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { GroupingHandlerResult } from "../../../../hierarchy-builder/internal/operators/Grouping"; -import { applyGroupHidingParams } from "../../../../hierarchy-builder/internal/operators/grouping/GroupHiding"; +import { GroupingHandlerResult } from "../../../../hierarchies/internal/operators/Grouping"; +import { applyGroupHidingParams } from "../../../../hierarchies/internal/operators/grouping/GroupHiding"; import { createTestProcessedGroupingNode, createTestProcessedInstanceNode } from "../../../Utils"; describe("GroupHiding", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/LabelGrouping.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/LabelGrouping.test.ts similarity index 97% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/LabelGrouping.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/LabelGrouping.test.ts index e05bbfd8d..fcf267661 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/LabelGrouping.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/LabelGrouping.test.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { GroupingNodeKey } from "../../../../hierarchy-builder/HierarchyNode"; -import { GroupingHandlerResult } from "../../../../hierarchy-builder/internal/operators/Grouping"; -import { createLabelGroups } from "../../../../hierarchy-builder/internal/operators/grouping/LabelGrouping"; +import { GroupingNodeKey } from "../../../../hierarchies/HierarchyNode"; +import { GroupingHandlerResult } from "../../../../hierarchies/internal/operators/Grouping"; +import { createLabelGroups } from "../../../../hierarchies/internal/operators/grouping/LabelGrouping"; import { createTestInstanceKey, createTestProcessedGroupingNode, createTestProcessedInstanceNode } from "../../../Utils"; describe("LabelGrouping", () => { diff --git a/packages/hierarchy-builder/src/test/internal/operators/grouping/PropertiesGrouping.test.ts b/packages/hierarchies/src/test/internal/operators/grouping/PropertiesGrouping.test.ts similarity index 99% rename from packages/hierarchy-builder/src/test/internal/operators/grouping/PropertiesGrouping.test.ts rename to packages/hierarchies/src/test/internal/operators/grouping/PropertiesGrouping.test.ts index 176593f8a..fb7f36d0f 100644 --- a/packages/hierarchy-builder/src/test/internal/operators/grouping/PropertiesGrouping.test.ts +++ b/packages/hierarchies/src/test/internal/operators/grouping/PropertiesGrouping.test.ts @@ -5,12 +5,11 @@ import { expect } from "chai"; import sinon from "sinon"; - -import { ECClass, ECProperty, IMetadataProvider } from "../../../../hierarchy-builder/ECMetadata"; -import { GroupingNodeKey, HierarchyNodePropertyGroup, PropertyOtherValuesGroupingNodeKey } from "../../../../hierarchy-builder/HierarchyNode"; -import { BaseClassChecker } from "../../../../hierarchy-builder/internal/Common"; -import * as propertiesGrouping from "../../../../hierarchy-builder/internal/operators/grouping/PropertiesGrouping"; -import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../../../hierarchy-builder/values/Formatting"; +import { ECClass, ECProperty, IMetadataProvider } from "../../../../hierarchies/ECMetadata"; +import { GroupingNodeKey, HierarchyNodePropertyGroup, PropertyOtherValuesGroupingNodeKey } from "../../../../hierarchies/HierarchyNode"; +import { BaseClassChecker } from "../../../../hierarchies/internal/Common"; +import * as propertiesGrouping from "../../../../hierarchies/internal/operators/grouping/PropertiesGrouping"; +import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../../../hierarchies/values/Formatting"; import { ClassStubs, createClassStubs, createTestProcessedGroupingNode, createTestProcessedInstanceNode, testLocalizedStrings } from "../../../Utils"; describe("PropertiesGrouping", () => { diff --git a/packages/hierarchy-builder/src/test/queries/InstanceLabelSelectClauseFactory.test.ts b/packages/hierarchies/src/test/queries/InstanceLabelSelectClauseFactory.test.ts similarity index 97% rename from packages/hierarchy-builder/src/test/queries/InstanceLabelSelectClauseFactory.test.ts rename to packages/hierarchies/src/test/queries/InstanceLabelSelectClauseFactory.test.ts index eb2186a02..815f0f827 100644 --- a/packages/hierarchy-builder/src/test/queries/InstanceLabelSelectClauseFactory.test.ts +++ b/packages/hierarchies/src/test/queries/InstanceLabelSelectClauseFactory.test.ts @@ -5,15 +5,15 @@ import { expect } from "chai"; import sinon from "sinon"; -import { IMetadataProvider } from "../../hierarchy-builder/ECMetadata"; -import { createConcatenatedValueJsonSelector, createRawPropertyValueSelector } from "../../hierarchy-builder/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; +import { IMetadataProvider } from "../../hierarchies/ECMetadata"; +import { createConcatenatedValueJsonSelector, createRawPropertyValueSelector } from "../../hierarchies/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; import { BisInstanceLabelSelectClauseFactory, ClassBasedInstanceLabelSelectClauseFactory, DefaultInstanceLabelSelectClauseFactory, IInstanceLabelSelectClauseFactory, -} from "../../hierarchy-builder/queries/InstanceLabelSelectClauseFactory"; -import { trimWhitespace } from "../../hierarchy-builder/Utils"; +} from "../../hierarchies/queries/InstanceLabelSelectClauseFactory"; +import { trimWhitespace } from "../../hierarchies/Utils"; import { ClassStubs, createClassStubs } from "../Utils"; describe("DefaultInstanceLabelSelectClauseFactory", () => { diff --git a/packages/hierarchy-builder/src/test/queries/NodeSelectQueryFactory.test.ts b/packages/hierarchies/src/test/queries/NodeSelectQueryFactory.test.ts similarity index 99% rename from packages/hierarchy-builder/src/test/queries/NodeSelectQueryFactory.test.ts rename to packages/hierarchies/src/test/queries/NodeSelectQueryFactory.test.ts index 83ffc1360..5a74efa65 100644 --- a/packages/hierarchy-builder/src/test/queries/NodeSelectQueryFactory.test.ts +++ b/packages/hierarchies/src/test/queries/NodeSelectQueryFactory.test.ts @@ -19,9 +19,9 @@ import { ECPrimitiveProperty, ECStructProperty, IMetadataProvider, -} from "../../hierarchy-builder/ECMetadata"; -import { NodeSelectClauseColumnNames, NodeSelectQueryFactory } from "../../hierarchy-builder/queries/NodeSelectQueryFactory"; -import { trimWhitespace } from "../../hierarchy-builder/Utils"; +} from "../../hierarchies/ECMetadata"; +import { NodeSelectClauseColumnNames, NodeSelectQueryFactory } from "../../hierarchies/queries/NodeSelectQueryFactory"; +import { trimWhitespace } from "../../hierarchies/Utils"; import { ClassStubs, createClassStubs } from "../Utils"; describe("NodeSelectQueryFactory", () => { diff --git a/packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts b/packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts rename to packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts index 3bc4eac1e..335f3349f 100644 --- a/packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts +++ b/packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlJoinSnippets.test.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { ECClass, ECNavigationProperty, ECRelationshipClass, IMetadataProvider } from "../../../hierarchy-builder/ECMetadata"; -import { createRelationshipPathJoinClause } from "../../../hierarchy-builder/queries/ecsql-snippets/ECSqlJoinSnippets"; -import { trimWhitespace } from "../../../hierarchy-builder/Utils"; +import { ECClass, ECNavigationProperty, ECRelationshipClass, IMetadataProvider } from "../../../hierarchies/ECMetadata"; +import { createRelationshipPathJoinClause } from "../../../hierarchies/queries/ecsql-snippets/ECSqlJoinSnippets"; +import { trimWhitespace } from "../../../hierarchies/Utils"; import { ClassStubs, createClassStubs, ResolvablePromise } from "../../Utils"; describe("createRelationshipPathJoinClause", () => { diff --git a/packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts b/packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts similarity index 98% rename from packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts rename to packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts index 773a272b8..dea3d6cc2 100644 --- a/packages/hierarchy-builder/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts +++ b/packages/hierarchies/src/test/queries/ecsql-snippets/ECSqlValueSelectorSnippets.test.ts @@ -11,8 +11,8 @@ import { createRawPrimitiveValueSelector, createRawPropertyValueSelector, TypedValueSelectClauseProps, -} from "../../../hierarchy-builder/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; -import { trimWhitespace } from "../../../hierarchy-builder/Utils"; +} from "../../../hierarchies/queries/ecsql-snippets/ECSqlValueSelectorSnippets"; +import { trimWhitespace } from "../../../hierarchies/Utils"; describe("TypedValueSelectClauseProps", () => { describe("isPropertySelector", () => { diff --git a/packages/hierarchy-builder/src/test/values/ConcatenatedValue.test.ts b/packages/hierarchies/src/test/values/ConcatenatedValue.test.ts similarity index 95% rename from packages/hierarchy-builder/src/test/values/ConcatenatedValue.test.ts rename to packages/hierarchies/src/test/values/ConcatenatedValue.test.ts index 6e9e3fc1f..c9689de31 100644 --- a/packages/hierarchy-builder/src/test/values/ConcatenatedValue.test.ts +++ b/packages/hierarchies/src/test/values/ConcatenatedValue.test.ts @@ -5,8 +5,8 @@ import { expect } from "chai"; import { BeDuration } from "@itwin/core-bentley"; -import { ConcatenatedValue, ConcatenatedValuePart } from "../../hierarchy-builder/values/ConcatenatedValue"; -import { TypedPrimitiveValue } from "../../hierarchy-builder/values/Values"; +import { ConcatenatedValue, ConcatenatedValuePart } from "../../hierarchies/values/ConcatenatedValue"; +import { TypedPrimitiveValue } from "../../hierarchies/values/Values"; describe("ConcatenatedValuePart", () => { describe("isString", () => { diff --git a/packages/hierarchy-builder/src/test/values/Formatting.test.ts b/packages/hierarchies/src/test/values/Formatting.test.ts similarity index 96% rename from packages/hierarchy-builder/src/test/values/Formatting.test.ts rename to packages/hierarchies/src/test/values/Formatting.test.ts index 9f4ad7bcf..0d1749adf 100644 --- a/packages/hierarchy-builder/src/test/values/Formatting.test.ts +++ b/packages/hierarchies/src/test/values/Formatting.test.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { julianToDateTime } from "../../hierarchy-builder/internal/Common"; -import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../hierarchy-builder/values/Formatting"; +import { julianToDateTime } from "../../hierarchies/internal/Common"; +import { createDefaultValueFormatter, IPrimitiveValueFormatter } from "../../hierarchies/values/Formatting"; describe("createDefaultValueFormatter", () => { let formatter: IPrimitiveValueFormatter; diff --git a/packages/hierarchy-builder/src/test/values/Values.test.ts b/packages/hierarchies/src/test/values/Values.test.ts similarity index 99% rename from packages/hierarchy-builder/src/test/values/Values.test.ts rename to packages/hierarchies/src/test/values/Values.test.ts index 076d6a825..2d556f085 100644 --- a/packages/hierarchy-builder/src/test/values/Values.test.ts +++ b/packages/hierarchies/src/test/values/Values.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { expect } from "chai"; -import { InstanceKey, TypedPrimitiveValue } from "../../hierarchy-builder/values/Values"; +import { InstanceKey, TypedPrimitiveValue } from "../../hierarchies/values/Values"; describe("InstanceKey", () => { describe("equals", () => { diff --git a/packages/hierarchy-builder/tsconfig.cjs.json b/packages/hierarchies/tsconfig.cjs.json similarity index 100% rename from packages/hierarchy-builder/tsconfig.cjs.json rename to packages/hierarchies/tsconfig.cjs.json diff --git a/packages/hierarchy-builder/tsconfig.esm.json b/packages/hierarchies/tsconfig.esm.json similarity index 100% rename from packages/hierarchy-builder/tsconfig.esm.json rename to packages/hierarchies/tsconfig.esm.json diff --git a/packages/hierarchy-builder/tsconfig.json b/packages/hierarchies/tsconfig.json similarity index 100% rename from packages/hierarchy-builder/tsconfig.json rename to packages/hierarchies/tsconfig.json diff --git a/packages/models-tree/package.json b/packages/models-tree/package.json index ca81dfe4b..29378054f 100644 --- a/packages/models-tree/package.json +++ b/packages/models-tree/package.json @@ -32,12 +32,12 @@ "lint": "eslint ./src/**/*.ts" }, "peerDependencies": { - "@itwin/presentation-hierarchy-builder": "workspace:^" + "@itwin/presentation-hierarchies": "workspace:^" }, "devDependencies": { "@itwin/build-tools": "^4.4.0", "@itwin/eslint-plugin": "4.0.0-dev.48", - "@itwin/presentation-hierarchy-builder": "workspace:^", + "@itwin/presentation-hierarchies": "workspace:^", "cpx2": "^7.0.1", "eslint": "^8.56.0", "source-map-support": "^0.5.21", diff --git a/packages/models-tree/src/models-tree/ModelsTreeDefinition.ts b/packages/models-tree/src/models-tree/ModelsTreeDefinition.ts index bc3e04af3..510aecb98 100644 --- a/packages/models-tree/src/models-tree/ModelsTreeDefinition.ts +++ b/packages/models-tree/src/models-tree/ModelsTreeDefinition.ts @@ -25,7 +25,7 @@ import { NodeSelectQueryFactory, parseFullClassName, ProcessedHierarchyNode, -} from "@itwin/presentation-hierarchy-builder"; +} from "@itwin/presentation-hierarchies"; export interface ModelsTreeDefinitionProps { metadataProvider: IMetadataProvider; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79bac82aa..812a6fe0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,9 +154,9 @@ importers: '@itwin/presentation-core-interop': specifier: workspace:* version: link:../../../packages/core-interop - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:* - version: link:../../../packages/hierarchy-builder + version: link:../../../packages/hierarchies '@itwin/presentation-models-tree': specifier: workspace:* version: link:../../../packages/models-tree @@ -199,9 +199,9 @@ importers: '@itwin/presentation-core-interop': specifier: workspace:* version: link:../../packages/core-interop - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:* - version: link:../../packages/hierarchy-builder + version: link:../../packages/hierarchies '@itwin/presentation-models-tree': specifier: workspace:* version: link:../../packages/models-tree @@ -461,9 +461,9 @@ importers: '@itwin/presentation-hierarchies-react': specifier: workspace:* version: link:../../../packages/hierarchies-react - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:* - version: link:../../../packages/hierarchy-builder + version: link:../../../packages/hierarchies '@itwin/presentation-models-tree': specifier: workspace:* version: link:../../../packages/models-tree @@ -745,9 +745,9 @@ importers: '@itwin/presentation-common': specifier: ^4.4.0 version: 4.4.0(@itwin/core-bentley@4.4.0)(@itwin/core-common@4.4.0)(@itwin/core-quantity@4.4.0)(@itwin/ecschema-metadata@4.4.0) - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:^ - version: link:../hierarchy-builder + version: link:../hierarchies '@types/chai': specifier: ^4.3.11 version: 4.3.11 @@ -865,9 +865,9 @@ importers: '@itwin/presentation-frontend': specifier: ^4.4.0 version: 4.4.0(@itwin/core-bentley@4.4.0)(@itwin/core-common@4.4.0)(@itwin/core-frontend@4.4.0)(@itwin/core-quantity@4.4.0)(@itwin/ecschema-metadata@4.4.0)(@itwin/presentation-common@4.4.0) - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:^ - version: link:../hierarchy-builder + version: link:../hierarchies '@itwin/presentation-models-tree': specifier: workspace:^ version: link:../models-tree @@ -1003,9 +1003,9 @@ importers: '@itwin/presentation-common': specifier: ^4.4.0 version: 4.4.0(@itwin/core-bentley@4.4.0)(@itwin/core-common@4.4.0)(@itwin/core-quantity@4.4.0)(@itwin/ecschema-metadata@4.4.0) - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:* - version: link:../hierarchy-builder + version: link:../hierarchies classnames: specifier: ^2.3.2 version: 2.3.2 @@ -1107,7 +1107,7 @@ importers: specifier: ~5.0.4 version: 5.0.4 - packages/hierarchy-builder: + packages/hierarchies: dependencies: '@itwin/core-bentley': specifier: ^4.4.0 @@ -1191,9 +1191,9 @@ importers: '@itwin/eslint-plugin': specifier: 4.0.0-dev.48 version: 4.0.0-dev.48(eslint@8.56.0)(typescript@5.0.4) - '@itwin/presentation-hierarchy-builder': + '@itwin/presentation-hierarchies': specifier: workspace:^ - version: link:../hierarchy-builder + version: link:../hierarchies cpx2: specifier: ^7.0.1 version: 7.0.1