Skip to content

Commit

Permalink
Merge branch 'master' into rob/metadata-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
rschili committed Feb 6, 2025
2 parents 07b343c + 0da98a8 commit c3b7fc5
Show file tree
Hide file tree
Showing 256 changed files with 1,053 additions and 651 deletions.
20 changes: 7 additions & 13 deletions common/api/core-backend.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ import { ECSqlValueType } from '@itwin/core-common';
import { EditingScopeNotifications } from '@itwin/core-common';
import { ElementAlignedBox3d } from '@itwin/core-common';
import { ElementAspectProps } from '@itwin/core-common';
import { ElementGeometryBuilderParams } from '@itwin/core-common';
import { ElementGeometryBuilderParamsForPart } from '@itwin/core-common';
import { ElementGeometryCacheOperationRequestProps } from '@itwin/core-common';
import { ElementGeometryCacheRequestProps } from '@itwin/core-common';
import { ElementGeometryCacheResponseProps } from '@itwin/core-common';
Expand Down Expand Up @@ -293,14 +291,14 @@ export abstract class AuxCoordSystem extends DefinitionElement {
// (undocumented)
description?: string;
// (undocumented)
type: number;
type?: number;
}

// @public
export class AuxCoordSystem2d extends AuxCoordSystem {
constructor(props: AuxCoordSystem2dProps, iModel: IModelDb);
// (undocumented)
angle: number;
angle?: number;
// (undocumented)
static get className(): string;
static createCode(iModel: IModelDb, scopeModelId: CodeScopeProps, codeValue: string): Code;
Expand All @@ -317,11 +315,11 @@ export class AuxCoordSystem3d extends AuxCoordSystem {
// (undocumented)
origin?: Point3d;
// (undocumented)
pitch: number;
pitch?: number;
// (undocumented)
roll: number;
roll?: number;
// (undocumented)
yaw: number;
yaw?: number;
}

// @public
Expand Down Expand Up @@ -2850,8 +2848,6 @@ export abstract class GeometricElement extends Element_2 {
static get className(): string;
// (undocumented)
protected collectReferenceIds(referenceIds: EntityReferenceSet): void;
// @beta
elementGeometryBuilderParams?: ElementGeometryBuilderParams;
geom?: GeometryStreamProps;
getPlacementTransform(): Transform;
is2d(): this is GeometricElement2d;
Expand Down Expand Up @@ -2950,8 +2946,6 @@ export class GeometryPart extends DefinitionElement {
// (undocumented)
static get className(): string;
static createCode(iModel: IModelDb, scopeModelId: CodeScopeProps, codeValue: string): Code;
// @beta
elementGeometryBuilderParams?: ElementGeometryBuilderParamsForPart;
// (undocumented)
geom?: GeometryStreamProps;
// (undocumented)
Expand Down Expand Up @@ -3827,7 +3821,7 @@ export class LightLocation extends SpatialLocationElement {
protected constructor(props: LightLocationProps, iModel: IModelDb);
// (undocumented)
static get className(): string;
enabled: boolean;
enabled?: boolean;
}

// @public
Expand Down Expand Up @@ -4262,7 +4256,7 @@ export class Model extends Entity {
// @beta
protected static onUpdateElement(_arg: OnElementInModelPropsArg): void;
// (undocumented)
readonly parentModel: Id64String;
readonly parentModel?: Id64String;
// @internal (undocumented)
static get protectedOperations(): string[];
removeUserProperties(nameSpace: string): void;
Expand Down
48 changes: 9 additions & 39 deletions common/api/core-frontend.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -2818,6 +2818,10 @@ export class DisplayStyle3dState extends DisplayStyleState {

// @public
export abstract class DisplayStyleState extends ElementState implements DisplayStyleProps {
// @internal
readonly [_onScheduleScriptReferenceChanged]: BeEvent<(newScriptReference: RenderSchedule.ScriptReference | undefined) => void>;
// @internal
get [_scheduleScriptReference](): RenderSchedule.ScriptReference | undefined;
constructor(props: DisplayStyleProps, iModel: IModelConnection, source?: DisplayStyleState);
// @internal (undocumented)
anyMapLayersVisible(overlay: boolean): boolean;
Expand Down Expand Up @@ -2898,8 +2902,6 @@ export abstract class DisplayStyleState extends ElementState implements DisplayS
get name(): string;
readonly onOSMBuildingDisplayChanged: BeEvent<(osmBuildingDisplayEnabled: boolean) => void>;
readonly onScheduleScriptChanged: BeEvent<(newScript: RenderSchedule.Script | undefined) => void>;
// @deprecated
readonly onScheduleScriptReferenceChanged: BeEvent<(newScriptReference: RenderSchedule.ScriptReference | undefined) => void>;
overrideSubCategory(id: Id64String, ovr: SubCategoryOverride): void;
// @internal (undocumented)
abstract overrideTerrainDisplay(): TerrainDisplayOverrides | undefined;
Expand All @@ -2912,8 +2914,6 @@ export abstract class DisplayStyleState extends ElementState implements DisplayS
protected registerSettingsEventListeners(): void;
get scheduleScript(): RenderSchedule.Script | undefined;
set scheduleScript(script: RenderSchedule.Script | undefined);
// @deprecated
get scheduleScriptReference(): RenderSchedule.ScriptReference | undefined;
setOSMBuildingDisplay(options: OsmBuildingDisplayOptions): boolean;
// @internal
setSubCategoryVisible(subCategoryId: Id64String, visible: boolean): boolean;
Expand Down Expand Up @@ -4911,20 +4911,6 @@ export interface GroupMark {
// @internal
export function headersIncludeAuthMethod(headers: Headers, query: string[]): boolean;

// @internal (undocumented)
export interface Hilites {
// (undocumented)
readonly elements: Id64.Uint32Set;
// (undocumented)
readonly isEmpty: boolean;
// (undocumented)
readonly models: Id64.Uint32Set;
// (undocumented)
readonly modelSubCategoryMode: ModelSubCategoryHiliteMode;
// (undocumented)
readonly subcategories: Id64.Uint32Set;
}

// @public
export class HiliteSet {
constructor(iModel: IModelConnection, syncWithSelectionSet?: boolean);
Expand Down Expand Up @@ -8207,25 +8193,6 @@ export class NullTarget extends RenderTarget {
get wantInvertBlackBackground(): boolean;
}

// @internal (undocumented)
export class OffScreenTarget extends Target {
constructor(rect: ViewRect);
// (undocumented)
protected _assignDC(): boolean;
// (undocumented)
protected _beginPaint(fbo: FrameBuffer): void;
// (undocumented)
protected _endPaint(): void;
// (undocumented)
onResized(): void;
// (undocumented)
readImageToCanvas(): HTMLCanvasElement;
// (undocumented)
setViewRect(rect: ViewRect, temporary: boolean): void;
// (undocumented)
updateViewRect(): boolean;
}

// @public
export class OffScreenViewport extends Viewport {
protected constructor(target: RenderTarget);
Expand Down Expand Up @@ -10537,6 +10504,9 @@ export interface SceneVolumeClassifier {
modelId: Id64String;
}

// @internal (undocumented)
export const _scheduleScriptReference: unique symbol;

// @public
export interface ScreenSpaceEffectBuilder {
addUniform: (params: UniformParams) => void;
Expand Down Expand Up @@ -14946,6 +14916,8 @@ export class ViewRedoTool extends ViewTool {

// @public
export abstract class ViewState extends ElementState {
// @internal (undocumented)
get [_scheduleScriptReference](): RenderSchedule.ScriptReference | undefined;
// @internal
protected constructor(props: ViewDefinitionProps, iModel: IModelConnection, categoryOrClone: CategorySelectorState, displayStyle: DisplayStyleState);
adjustAspectRatio(aspect: number): void;
Expand Down Expand Up @@ -15074,8 +15046,6 @@ export abstract class ViewState extends ElementState {
resetExtentLimits(): void;
abstract savePose(): ViewPose;
get scheduleScript(): RenderSchedule.Script | undefined;
// @internal (undocumented)
get scheduleScriptReference(): RenderSchedule.ScriptReference | undefined;
// @internal
get secondaryViewports(): Iterable<Viewport>;
setAspectRatioSkew(val: number): void;
Expand Down
1 change: 0 additions & 1 deletion common/api/ecschema-metadata.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,6 @@ export class RelationshipClass extends ECClass {
fromJSON(relationshipClassProps: RelationshipClassProps): Promise<void>;
// (undocumented)
fromJSONSync(relationshipClassProps: RelationshipClassProps): void;
static isRelationshipClass(item?: SchemaItem): item is RelationshipClass;
// (undocumented)
readonly schema: Schema;
// (undocumented)
Expand Down
3 changes: 1 addition & 2 deletions common/api/summary/core-frontend.exports.csv
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ public;enum;GraphicType
internal;interface;GroundPlaneDecorations
public;interface;GroupMark
internal;function;headersIncludeAuthMethod
internal;interface;Hilites
public;class;HiliteSet
public;class;HitDetail
public;interface;HitDetailProps
Expand Down Expand Up @@ -508,7 +507,6 @@ public;class;NotificationManager
public;class;NotifyMessageDetails
internal;class;NullRenderSystem
internal;class;NullTarget
internal;class;OffScreenTarget
public;class;OffScreenViewport
public;interface;OffScreenViewportOptions
internal;interface;OldTextureImage
Expand Down Expand Up @@ -666,6 +664,7 @@ internal;class;SavedState
public;class;Scene
public;class;SceneContext
internal;interface;SceneVolumeClassifier
internal;const;_scheduleScriptReference
public;interface;ScreenSpaceEffectBuilder
public;interface;ScreenSpaceEffectBuilderParams
public;interface;ScreenSpaceEffectContext
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/build-tools",
"comment": "Enabled `useDefineForClassFields` TypeScript config flag",
"type": "none"
}
],
"packageName": "@itwin/build-tools"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-backend",
"comment": "Changed `Model.parentModel`, `LightLocation.enabled` and some of the `AuxCoordSystem` properties to be optional",
"type": "none"
}
],
"packageName": "@itwin/core-backend"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-bentley",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-bentley"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-common",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-common"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-common",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-common"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-frontend",
"comment": "Removed deprecated scheduleScriptReference and onScheduleScriptReferencedChanged from DisplayStyleState.",
"type": "none"
}
],
"packageName": "@itwin/core-frontend"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-frontend",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-frontend"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-quantity",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-quantity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-quantity",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/core-quantity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/ecschema-metadata",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/ecschema-metadata"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/frontend-devtools",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/frontend-devtools"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/presentation-common",
"comment": "",
"type": "none"
}
],
"packageName": "@itwin/presentation-common"
}
18 changes: 9 additions & 9 deletions common/config/azure-pipelines/templates/core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ steps:
RUSH_BUILD_CACHE_ENABLED: ${{parameters.rushBuildCacheEnabled}}
VITE_CI: true

# - script: npm run android:all
# workingDirectory: test-apps/display-test-app
# displayName: Build & run Android display-test-app
# env:
# IMJS_OIDC_CLIENT_ID: $(IMJS_OIDC_CLIENT_ID)
# IMJS_OIDC_CLIENT_SECRET: $(IMJS_OIDC_CLIENT_SECRET)
# AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
# TOKEN: $(GitHubPAT)
# condition: and(succeeded(), ${{ parameters.buildMobile }}, eq(variables['Agent.OS'], 'Darwin'))
- script: npm run android:all
workingDirectory: test-apps/display-test-app
displayName: Build & run Android display-test-app
env:
IMJS_OIDC_CLIENT_ID: $(IMJS_OIDC_CLIENT_ID)
IMJS_OIDC_CLIENT_SECRET: $(IMJS_OIDC_CLIENT_SECRET)
AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
TOKEN: $(GitHubPAT)
condition: and(succeeded(), ${{ parameters.buildMobile }}, eq(variables['Agent.OS'], 'Darwin'))

- script: npm run ios:all
workingDirectory: test-apps/display-test-app
Expand Down
2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"policyName": "prerelease-monorepo-lockStep",
"definitionName": "lockStepVersion",
"version": "5.0.0-dev.56",
"version": "5.0.0-dev.57",
"nextBump": "prerelease"
}
]
2 changes: 1 addition & 1 deletion core/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@itwin/core-backend",
"version": "5.0.0-dev.56",
"version": "5.0.0-dev.57",
"description": "iTwin.js backend components",
"main": "lib/cjs/core-backend.js",
"typings": "lib/cjs/core-backend",
Expand Down
Loading

0 comments on commit c3b7fc5

Please sign in to comment.