Skip to content

Commit

Permalink
Merge branch 'master' into eringram/graphicrepresentation-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
eringram authored Jan 23, 2025
2 parents d116c2a + 5fc3a18 commit 6c62d84
Show file tree
Hide file tree
Showing 506 changed files with 7,943 additions and 8,837 deletions.
2 changes: 2 additions & 0 deletions .vscode/cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
"isolines",
"isoparameter",
"itwin",
"itwin.js",
"itwinjs",
"itwinui",
"jsonproperties",
Expand Down Expand Up @@ -427,6 +428,7 @@
"viewports",
"viewstate",
"webgl",
"webpack",
"weightpicker",
"Wireframe",
"wiremesh",
Expand Down
29 changes: 18 additions & 11 deletions common/api/core-backend.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ import { Id64Arg } from '@itwin/core-bentley';
import { Id64Array } from '@itwin/core-bentley';
import { Id64Set } from '@itwin/core-bentley';
import { Id64String } from '@itwin/core-bentley';
import { IDisposable } from '@itwin/core-bentley';
import { ImageSourceFormat } from '@itwin/core-common';
import { IModel } from '@itwin/core-common';
import { IModelCoordinatesRequestProps } from '@itwin/core-common';
Expand Down Expand Up @@ -644,14 +643,14 @@ export interface ChangedECInstance {
}

// @internal
export class ChangedElementsDb implements IDisposable {
export class ChangedElementsDb implements Disposable {
// (undocumented)
[Symbol.dispose](): void;
constructor();
// (undocumented)
cleanCaches(): void;
closeDb(): void;
static createDb(briefcase: IModelDb, pathName: string): ChangedElementsDb;
// (undocumented)
dispose(): void;
getChangeData(startChangesetId: string, endChangesetId: string): ChangeData | undefined;
getChangedElements(startChangesetId: string, endChangesetId: string): ChangedElements | undefined;
getChangedModels(startChangesetId: string, endChangesetId: string): ChangedModels | undefined;
Expand Down Expand Up @@ -715,7 +714,8 @@ export interface ChangesetArg extends IModelIdArg {
}

// @beta
export class ChangesetECAdaptor implements IDisposable {
export class ChangesetECAdaptor implements Disposable {
[Symbol.dispose](): void;
constructor(reader: SqliteChangesetReader, disableMetaData?: boolean);
acceptClass(classFullName: string): ChangesetECAdaptor;
acceptOp(op: SqliteChangeOp): ChangesetECAdaptor;
Expand All @@ -729,7 +729,6 @@ export class ChangesetECAdaptor implements IDisposable {
deleted?: ChangedECInstance;
// (undocumented)
readonly disableMetaData: boolean;
dispose(): void;
inserted?: ChangedECInstance;
get isDeleted(): boolean;
isECTable(tableName: string): boolean;
Expand Down Expand Up @@ -1782,16 +1781,18 @@ export abstract class DriverBundleElement extends InformationContentElement {
}

// @public
export class ECDb implements IDisposable {
export class ECDb implements Disposable {
// @internal (undocumented)
get [_nativeDb](): IModelJsNative.ECDb;
[Symbol.dispose](): void;
constructor();
abandonChanges(): void;
// @internal
clearStatementCache(): void;
closeDb(): void;
createDb(pathName: string): void;
createQueryReader(ecsql: string, params?: QueryBinder, config?: QueryOptions): ECSqlReader;
// @deprecated (undocumented)
dispose(): void;
// @internal
getCachedStatementCount(): number;
Expand Down Expand Up @@ -1906,7 +1907,8 @@ export interface ECSqlRowArg {
}

// @public
export class ECSqlStatement implements IterableIterator<any>, IDisposable {
export class ECSqlStatement implements IterableIterator<any>, Disposable {
[Symbol.dispose](): void;
[Symbol.iterator](): IterableIterator<any>;
bindArray(parameter: number | string, val: any[]): void;
bindBlob(parameter: number | string, blob: string | Uint8Array | ArrayBuffer | SharedArrayBuffer): void;
Expand All @@ -1928,6 +1930,7 @@ export class ECSqlStatement implements IterableIterator<any>, IDisposable {
bindValue(parameter: number | string, val: any): void;
bindValues(values: any[] | object): void;
clearBindings(): void;
// @deprecated (undocumented)
dispose(): void;
getBinder(parameter: string | number): ECSqlBinder;
getColumnCount(): number;
Expand Down Expand Up @@ -3427,10 +3430,12 @@ export interface IModelDbFonts {

// @beta
export class IModelElementCloneContext {
[Symbol.dispose](): void;
constructor(sourceDb: IModelDb, targetDb?: IModelDb);
// @internal
cloneElement(sourceElement: Element_2, cloneOptions?: IModelJsNative.CloneElementOptions): ElementProps;
static create(...args: ConstructorParameters<typeof IModelElementCloneContext>): Promise<IModelElementCloneContext>;
// @deprecated (undocumented)
dispose(): void;
// @internal
dump(outputFileName: string): void;
Expand Down Expand Up @@ -5402,15 +5407,15 @@ export interface SqliteChange {
export type SqliteChangeOp = "Inserted" | "Updated" | "Deleted";

// @beta
export class SqliteChangesetReader implements IDisposable {
export class SqliteChangesetReader implements Disposable {
[Symbol.dispose](): void;
protected constructor(
db: AnyDb);
get changeIndex(): number;
close(): void;
get columnCount(): number;
readonly db: AnyDb;
get disableSchemaCheck(): boolean;
dispose(): void;
getChangeValue(columnIndex: number, stage: SqliteValueStage): SqliteValue_2;
getChangeValueBinary(columnIndex: number, stage: SqliteValueStage): Uint8Array | null | undefined;
getChangeValueDouble(columnIndex: number, stage: SqliteValueStage): number | null | undefined;
Expand Down Expand Up @@ -5562,7 +5567,8 @@ export namespace SQLiteDb {
}

// @public
export class SqliteStatement implements IterableIterator<any>, IDisposable {
export class SqliteStatement implements IterableIterator<any>, Disposable {
[Symbol.dispose](): void;
[Symbol.iterator](): IterableIterator<any>;
constructor(_sql: string);
bindBlob(parameter: BindParameter, blob: Uint8Array): void;
Expand All @@ -5578,6 +5584,7 @@ export class SqliteStatement implements IterableIterator<any>, IDisposable {
bindValue(parameter: BindParameter, value: any): void;
bindValues(values: any[] | object): void;
clearBindings(): void;
// @deprecated (undocumented)
dispose(): void;
getColumnBytes(colIndex: number): number;
getColumnCount(): number;
Expand Down
19 changes: 15 additions & 4 deletions common/api/core-bentley.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,15 @@ export class DisposableList implements IDisposable {
}

// @public
export function dispose(disposable?: Disposable): undefined;

// @public @deprecated (undocumented)
export function dispose(disposable?: IDisposable): undefined;

// @public
export function disposeArray(list?: Disposable[]): undefined;

// @public @deprecated (undocumented)
export function disposeArray(list?: IDisposable[]): undefined;

// @public
Expand Down Expand Up @@ -674,7 +680,7 @@ export type Id64Set = Set<Id64String>;
// @public
export type Id64String = string;

// @public
// @public @deprecated
export interface IDisposable {
dispose(): void;
}
Expand Down Expand Up @@ -988,6 +994,9 @@ export class IndexMap<T> {
}

// @public
export function isDisposable(obj: unknown): obj is Disposable;

// @public @deprecated
export function isIDisposable(obj: unknown): obj is IDisposable;

// @public
Expand Down Expand Up @@ -1385,9 +1394,11 @@ export class OrderedSet<T> extends ReadonlyOrderedSet<T> {
export function partitionArray<T>(array: T[], criterion: (element: T) => boolean): number;

// @public
export class PerfLogger implements IDisposable {
constructor(operation: string, metaData?: LoggingMetaData);
export class PerfLogger implements Disposable {
// (undocumented)
[Symbol.dispose](): void;
constructor(operation: string, metaData?: LoggingMetaData);
// @deprecated (undocumented)
dispose(): void;
}

Expand Down Expand Up @@ -1726,7 +1737,7 @@ export class UnexpectedErrors {
static setHandler(handler: OnUnexpectedError): OnUnexpectedError;
}

// @public
// @public @deprecated
export function using<T extends IDisposable, TResult>(resources: T | T[], func: (...r: T[]) => TResult): TResult;

// @public
Expand Down
9 changes: 5 additions & 4 deletions common/api/core-common.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import { GuidString } from '@itwin/core-bentley';
import { Id64 } from '@itwin/core-bentley';
import { Id64Array } from '@itwin/core-bentley';
import { Id64String } from '@itwin/core-bentley';
import { IDisposable } from '@itwin/core-bentley';
import { IModelJson } from '@itwin/core-geometry';
import { IModelStatus } from '@itwin/core-bentley';
import { IndexedPolyface } from '@itwin/core-geometry';
Expand Down Expand Up @@ -8075,11 +8074,13 @@ export namespace RenderSchedule {
}

// @public
export abstract class RenderTexture implements IDisposable {
export abstract class RenderTexture implements Disposable {
[Symbol.dispose](): void;
protected constructor(type: RenderTexture.Type);
// (undocumented)
abstract get bytesUsed(): number;
compare(other: RenderTexture): number;
// @deprecated (undocumented)
abstract dispose(): void;
// (undocumented)
get isGlyph(): boolean;
Expand Down Expand Up @@ -8715,6 +8716,8 @@ export class RpcRegistry {

// @internal
export abstract class RpcRequest<TResponse = any> {
// (undocumented)
[Symbol.dispose](): void;
constructor(client: RpcInterface, operation: string, parameters: any[]);
static get activeRequests(): ReadonlyMap<string, RpcRequest>;
static get aggregateLoad(): RpcOperationsProfile;
Expand All @@ -8725,8 +8728,6 @@ export abstract class RpcRequest<TResponse = any> {
protected computeRetryAfter(attempts: number): number;
get connecting(): boolean;
static current(context: RpcInterface): RpcRequest;
// (undocumented)
dispose(): void;
get elapsed(): number;
static readonly events: BeEvent<RpcRequestEventHandler>;
get extendedStatus(): string;
Expand Down
Loading

0 comments on commit 6c62d84

Please sign in to comment.