@itwin/core-backend 4.0.0-dev.99 → 4.1.0-dev.2

package/lib/cjs/ElementAspect.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementAspect.js","sourceRoot":"","sources":["../../src/ElementAspect.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ElementAspects\r\n */\r\n\r\nimport { ChannelRootAspectProps, ElementAspectProps, EntityReferenceSet, ExternalSourceAspectProps, RelatedElement } from \"@itwin/core-common\";\r\nimport { Entity } from \"./Entity\";\r\nimport { IModelDb } from \"./IModelDb\";\r\nimport { ECSqlStatement } from \"./ECSqlStatement\";\r\nimport { DbResult, Id64String } from \"@itwin/core-bentley\";\r\n\r\n/** Argument for the `ElementAspect.onXxx` static methods\r\n * @beta\r\n */\r\nexport interface OnAspectArg {\r\n  /** The iModel for the aspect affected by this event. */\r\n  iModel: IModelDb;\r\n  /** The model for the aspect affected by this event */\r\n  model: Id64String;\r\n}\r\n/** Argument for the `ElementAspect.onXxx` static methods that supply the properties of an aspect to be inserted or updated.\r\n * @beta\r\n */\r\nexport interface OnAspectPropsArg extends OnAspectArg {\r\n  /** The new properties of the aspect affected by this event. */\r\n  props: Readonly<ElementAspectProps>;\r\n}\r\n/** Argument for the `ElementAspect.onXxx` static methods that only supply the Id of the affected aspect.\r\n * @beta\r\n */\r\nexport interface OnAspectIdArg extends OnAspectArg {\r\n  /** The Id of the aspect affected by this event */\r\n  aspectId: Id64String;\r\n}\r\n\r\n/** An Element Aspect is a class that defines a set of properties that are related to (and owned by) a single element.\r\n * Semantically, an ElementAspect can be considered part of the Element. Thus, an ElementAspect is deleted if its owning Element is deleted.\r\n * BIS Guideline: Subclass ElementUniqueAspect or ElementMultiAspect rather than subclassing ElementAspect directly.\r\n * @public\r\n */\r\nexport class ElementAspect extends Entity {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementAspect\"; }\r\n  public element: RelatedElement;\r\n\r\n  /** @internal */\r\n  constructor(props: ElementAspectProps, iModel: IModelDb) {\r\n    super(props, iModel);\r\n    this.element = RelatedElement.fromJSON(props.element)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion\r\n  }\r\n\r\n  /** @internal */\r\n  public override toJSON(): ElementAspectProps {\r\n    const val = super.toJSON() as ElementAspectProps;\r\n    val.element = this.element;\r\n    return val;\r\n  }\r\n\r\n  /** Called before a new ElementAspect is inserted.\r\n   * @note throw an exception to disallow the insert\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onInsert(arg: OnAspectPropsArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after a new ElementAspect was inserted.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onInserted(_arg: OnAspectPropsArg): void { }\r\n\r\n  /** Called before an ElementAspect is updated.\r\n   * @note throw an exception to disallow the update\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onUpdate(arg: OnAspectPropsArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after an ElementAspect was updated.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onUpdated(_arg: OnAspectPropsArg): void { }\r\n\r\n  /** Called before an ElementAspect is deleted.\r\n   * @note throw an exception to disallow the delete\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onDelete(arg: OnAspectIdArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after an ElementAspect was deleted.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onDeleted(_arg: OnAspectIdArg): void { }\r\n}\r\n\r\n/** An Element Unique Aspect is an ElementAspect where there can be only zero or one instance of the Element Aspect class per Element.\r\n * @public\r\n */\r\nexport class ElementUniqueAspect extends ElementAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementUniqueAspect\"; }\r\n}\r\n\r\n/** An Element Multi-Aspect is an ElementAspect where there can be **n** instances of the Element Aspect class per Element.\r\n * @public\r\n */\r\nexport class ElementMultiAspect extends ElementAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementMultiAspect\"; }\r\n}\r\n\r\n/**\r\n * @public\r\n */\r\nexport class ChannelRootAspect extends ElementUniqueAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ChannelRootAspect\"; }\r\n  /** Insert a ChannelRootAspect on the specified element.\r\n   * @deprecated in 4.0 use [[ChannelControl.insertChannelSubject]]\r\n   */\r\n  public static insert(iModel: IModelDb, ownerId: Id64String, channelName: string) {\r\n    const props: ChannelRootAspectProps = { classFullName: this.classFullName, element: { id: ownerId }, owner: channelName };\r\n    iModel.elements.insertAspect(props);\r\n  }\r\n}\r\n\r\n/** An ElementMultiAspect that stores synchronization information for an Element originating from an external source.\r\n * @note The associated ECClass was added to the BisCore schema in version 1.0.2\r\n * @public\r\n */\r\nexport class ExternalSourceAspect extends ElementMultiAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ExternalSourceAspect\"; }\r\n\r\n  /** An element that scopes the combination of `kind` and `identifier` to uniquely identify the object from the external source.\r\n   * @note Warning: in a future major release the `scope` property will be optional, since the scope is intended to be potentially invalid.\r\n   *       all references should treat it as potentially undefined, but we cannot change the type yet since that is a breaking change.\r\n   */\r\n  public scope: RelatedElement;\r\n  /** The identifier of the object in the source repository. */\r\n  public identifier: string;\r\n  /** The kind of object within the source repository. */\r\n  public kind: string;\r\n  /** The cryptographic hash (any algorithm) of the source object's content. If defined, it must be guaranteed to change when the source object's content changes. */\r\n  public checksum?: string;\r\n  /** An optional value that is typically a version number or a pseudo version number like last modified time.\r\n   * It will be used by the synchronization process to detect that a source object is unchanged so that computing a cryptographic hash can be avoided.\r\n   * If present, this value must be guaranteed to change when any of the source object's content changes.\r\n   */\r\n  public version?: string;\r\n  /** A place where additional JSON properties can be stored. For example, provenance information or properties relating to the synchronization process.\r\n   * @note Warning: in a future major release, the type of `jsonProperties` will be changed to object, and itwin.js will automatically stringify it when writing to the iModel.\r\n   * This will be a breaking change, since application code will have to change from supplying a string to supplying an object.\r\n   */\r\n  public jsonProperties?: string;\r\n  /** The source of the imported/synchronized object. Should point to an instance of [ExternalSource]($backend). */\r\n  public source?: RelatedElement;\r\n\r\n  /** @internal */\r\n  constructor(props: ExternalSourceAspectProps, iModel: IModelDb) {\r\n    super(props, iModel);\r\n    this.scope = RelatedElement.fromJSON(props.scope)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion\r\n    this.source = RelatedElement.fromJSON(props.source);\r\n    this.identifier = props.identifier;\r\n    this.kind = props.kind;\r\n    this.checksum = props.checksum;\r\n    this.version = props.version;\r\n    this.jsonProperties = props.jsonProperties;\r\n  }\r\n\r\n  /** @deprecated in 3.x. findAllBySource */\r\n  public static findBySource(iModelDb: IModelDb, scope: Id64String, kind: string, identifier: string): { elementId?: Id64String, aspectId?: Id64String } {\r\n    const sql = `SELECT Element.Id, ECInstanceId FROM ${ExternalSourceAspect.classFullName} WHERE (Scope.Id=:scope AND Kind=:kind AND Identifier=:identifier)`;\r\n    let elementId: Id64String | undefined;\r\n    let aspectId: Id64String | undefined;\r\n    iModelDb.withPreparedStatement(sql, (statement: ECSqlStatement) => {\r\n      statement.bindId(\"scope\", scope);\r\n      statement.bindString(\"kind\", kind);\r\n      statement.bindString(\"identifier\", identifier);\r\n      if (DbResult.BE_SQLITE_ROW === statement.step()) {\r\n        elementId = statement.getValue(0).getId();\r\n        aspectId = statement.getValue(1).getId();\r\n      }\r\n    });\r\n    return { elementId, aspectId };\r\n  }\r\n\r\n  /** Look up the elements that contain one or more ExternalSourceAspect with the specified Scope, Kind, and Identifier.\r\n   * The result of this function is an array of all of the ExternalSourceAspects that were found, each associated with the owning element.\r\n   * A given element could have more than one ExternalSourceAspect with the given scope, kind, and identifier.\r\n   * Also, many elements could have ExternalSourceAspect with the same scope, kind, and identifier.\r\n   * Therefore, the result array could have more than one entry with the same elementId.\r\n   * Aspects are never shared. Each aspect has its own unique ECInstanceId.\r\n   * @param iModelDb The iModel to query\r\n   * @param scope    The scope of the ExternalSourceAspects to find\r\n   * @param kind     The kind of the ExternalSourceAspects to find\r\n   * @param identifier The identifier of the ExternalSourceAspects to find\r\n   * @returns the query results\r\n  */\r\n  public static findAllBySource(iModelDb: IModelDb, scope: Id64String, kind: string, identifier: string): Array<{ elementId: Id64String, aspectId: Id64String }> {\r\n    const sql = `SELECT Element.Id, ECInstanceId FROM ${ExternalSourceAspect.classFullName} WHERE (Scope.Id=:scope AND Kind=:kind AND Identifier=:identifier)`;\r\n    const found: Array<{ elementId: Id64String, aspectId: Id64String }> = [];\r\n    iModelDb.withPreparedStatement(sql, (statement: ECSqlStatement) => {\r\n      statement.bindId(\"scope\", scope);\r\n      statement.bindString(\"kind\", kind);\r\n      statement.bindString(\"identifier\", identifier);\r\n      while (DbResult.BE_SQLITE_ROW === statement.step()) {\r\n        found.push({ elementId: statement.getValue(0).getId(), aspectId: statement.getValue(1).getId() });\r\n      }\r\n    });\r\n    return found;\r\n  }\r\n\r\n  /** @internal */\r\n  public override toJSON(): ExternalSourceAspectProps {\r\n    const val = super.toJSON() as ExternalSourceAspectProps;\r\n    val.scope = this.scope;\r\n    val.source = this.source;\r\n    val.identifier = this.identifier;\r\n    val.kind = this.kind;\r\n    val.checksum = this.checksum;\r\n    val.version = this.version;\r\n    val.jsonProperties = this.jsonProperties;\r\n    return val;\r\n  }\r\n\r\n  protected override collectReferenceIds(referenceIds: EntityReferenceSet): void {\r\n    super.collectReferenceIds(referenceIds);\r\n    if (this.scope)\r\n      referenceIds.addElement(this.scope.id);\r\n    referenceIds.addElement(this.element.id);\r\n    if (this.source)\r\n      referenceIds.addElement(this.source.id);\r\n  }\r\n}\r\n\r\n/** @public */\r\nexport namespace ExternalSourceAspect { // eslint-disable-line no-redeclare\r\n  /** Standard values for the `Kind` property of `ExternalSourceAspect`.\r\n   * @public\r\n   */\r\n  export enum Kind {\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing [[Element]] provenance */\r\n    Element = \"Element\",\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing [[Relationship]] provenance */\r\n    Relationship = \"Relationship\",\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing *scope* provenance\r\n     * @see [[ExternalSourceAspect.scope]]\r\n     */\r\n    Scope = \"Scope\",\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ElementAspect.js","sourceRoot":"","sources":["../../src/ElementAspect.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ElementAspects\r\n */\r\n\r\nimport { ChannelRootAspectProps, ElementAspectProps, EntityReferenceSet, ExternalSourceAspectProps, RelatedElement } from \"@itwin/core-common\";\r\nimport { Entity } from \"./Entity\";\r\nimport { IModelDb } from \"./IModelDb\";\r\nimport { ECSqlStatement } from \"./ECSqlStatement\";\r\nimport { DbResult, Id64String } from \"@itwin/core-bentley\";\r\n\r\n/** Argument for the `ElementAspect.onXxx` static methods\r\n * @beta\r\n */\r\nexport interface OnAspectArg {\r\n  /** The iModel for the aspect affected by this event. */\r\n  iModel: IModelDb;\r\n  /** The model for the aspect affected by this event */\r\n  model: Id64String;\r\n}\r\n/** Argument for the `ElementAspect.onXxx` static methods that supply the properties of an aspect to be inserted or updated.\r\n * @beta\r\n */\r\nexport interface OnAspectPropsArg extends OnAspectArg {\r\n  /** The new properties of the aspect affected by this event. */\r\n  props: Readonly<ElementAspectProps>;\r\n}\r\n/** Argument for the `ElementAspect.onXxx` static methods that only supply the Id of the affected aspect.\r\n * @beta\r\n */\r\nexport interface OnAspectIdArg extends OnAspectArg {\r\n  /** The Id of the aspect affected by this event */\r\n  aspectId: Id64String;\r\n}\r\n\r\n/** An Element Aspect is a class that defines a set of properties that are related to (and owned by) a single element.\r\n * Semantically, an ElementAspect can be considered part of the Element. Thus, an ElementAspect is deleted if its owning Element is deleted.\r\n * BIS Guideline: Subclass ElementUniqueAspect or ElementMultiAspect rather than subclassing ElementAspect directly.\r\n * @public\r\n */\r\nexport class ElementAspect extends Entity {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementAspect\"; }\r\n  public element: RelatedElement;\r\n\r\n  /** @internal */\r\n  constructor(props: ElementAspectProps, iModel: IModelDb) {\r\n    super(props, iModel);\r\n    this.element = RelatedElement.fromJSON(props.element)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion\r\n  }\r\n\r\n  /** @internal */\r\n  public override toJSON(): ElementAspectProps {\r\n    const val = super.toJSON() as ElementAspectProps;\r\n    val.element = this.element;\r\n    return val;\r\n  }\r\n\r\n  /** Called before a new ElementAspect is inserted.\r\n   * @note throw an exception to disallow the insert\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onInsert(arg: OnAspectPropsArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after a new ElementAspect was inserted.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onInserted(_arg: OnAspectPropsArg): void { }\r\n\r\n  /** Called before an ElementAspect is updated.\r\n   * @note throw an exception to disallow the update\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onUpdate(arg: OnAspectPropsArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after an ElementAspect was updated.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onUpdated(_arg: OnAspectPropsArg): void { }\r\n\r\n  /** Called before an ElementAspect is deleted.\r\n   * @note throw an exception to disallow the delete\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onDelete(arg: OnAspectIdArg): void {\r\n    arg.iModel.channels.verifyChannel(arg.model);\r\n  }\r\n\r\n  /** Called after an ElementAspect was deleted.\r\n   * @note If you override this method, you must call super.\r\n   * @beta\r\n   */\r\n  protected static onDeleted(_arg: OnAspectIdArg): void { }\r\n}\r\n\r\n/** An Element Unique Aspect is an ElementAspect where there can be only zero or one instance of the Element Aspect class per Element.\r\n * @public\r\n */\r\nexport class ElementUniqueAspect extends ElementAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementUniqueAspect\"; }\r\n}\r\n\r\n/** An Element Multi-Aspect is an ElementAspect where there can be **n** instances of the Element Aspect class per Element.\r\n * @public\r\n */\r\nexport class ElementMultiAspect extends ElementAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ElementMultiAspect\"; }\r\n}\r\n\r\n/**\r\n * @public\r\n */\r\nexport class ChannelRootAspect extends ElementUniqueAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ChannelRootAspect\"; }\r\n  /** Insert a ChannelRootAspect on the specified element.\r\n   * @deprecated in 4.0 use [[ChannelControl.makeChannelRoot]]. This method does not enforce the rule that channels may not nest and is therefore dangerous.\r\n   */\r\n  public static insert(iModel: IModelDb, ownerId: Id64String, channelName: string) {\r\n    const props: ChannelRootAspectProps = { classFullName: this.classFullName, element: { id: ownerId }, owner: channelName };\r\n    iModel.elements.insertAspect(props);\r\n  }\r\n}\r\n\r\n/** An ElementMultiAspect that stores synchronization information for an Element originating from an external source.\r\n * @note The associated ECClass was added to the BisCore schema in version 1.0.2\r\n * @public\r\n */\r\nexport class ExternalSourceAspect extends ElementMultiAspect {\r\n  /** @internal */\r\n  public static override get className(): string { return \"ExternalSourceAspect\"; }\r\n\r\n  /** An element that scopes the combination of `kind` and `identifier` to uniquely identify the object from the external source.\r\n   * @note Warning: in a future major release the `scope` property will be optional, since the scope is intended to be potentially invalid.\r\n   *       all references should treat it as potentially undefined, but we cannot change the type yet since that is a breaking change.\r\n   */\r\n  public scope: RelatedElement;\r\n  /** The identifier of the object in the source repository. */\r\n  public identifier: string;\r\n  /** The kind of object within the source repository. */\r\n  public kind: string;\r\n  /** The cryptographic hash (any algorithm) of the source object's content. If defined, it must be guaranteed to change when the source object's content changes. */\r\n  public checksum?: string;\r\n  /** An optional value that is typically a version number or a pseudo version number like last modified time.\r\n   * It will be used by the synchronization process to detect that a source object is unchanged so that computing a cryptographic hash can be avoided.\r\n   * If present, this value must be guaranteed to change when any of the source object's content changes.\r\n   */\r\n  public version?: string;\r\n  /** A place where additional JSON properties can be stored. For example, provenance information or properties relating to the synchronization process.\r\n   * @note Warning: in a future major release, the type of `jsonProperties` will be changed to object, and itwin.js will automatically stringify it when writing to the iModel.\r\n   * This will be a breaking change, since application code will have to change from supplying a string to supplying an object.\r\n   */\r\n  public jsonProperties?: string;\r\n  /** The source of the imported/synchronized object. Should point to an instance of [ExternalSource]($backend). */\r\n  public source?: RelatedElement;\r\n\r\n  /** @internal */\r\n  constructor(props: ExternalSourceAspectProps, iModel: IModelDb) {\r\n    super(props, iModel);\r\n    this.scope = RelatedElement.fromJSON(props.scope)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion\r\n    this.source = RelatedElement.fromJSON(props.source);\r\n    this.identifier = props.identifier;\r\n    this.kind = props.kind;\r\n    this.checksum = props.checksum;\r\n    this.version = props.version;\r\n    this.jsonProperties = props.jsonProperties;\r\n  }\r\n\r\n  /** @deprecated in 3.x. findAllBySource */\r\n  public static findBySource(iModelDb: IModelDb, scope: Id64String, kind: string, identifier: string): { elementId?: Id64String, aspectId?: Id64String } {\r\n    const sql = `SELECT Element.Id, ECInstanceId FROM ${ExternalSourceAspect.classFullName} WHERE (Scope.Id=:scope AND Kind=:kind AND Identifier=:identifier)`;\r\n    let elementId: Id64String | undefined;\r\n    let aspectId: Id64String | undefined;\r\n    iModelDb.withPreparedStatement(sql, (statement: ECSqlStatement) => {\r\n      statement.bindId(\"scope\", scope);\r\n      statement.bindString(\"kind\", kind);\r\n      statement.bindString(\"identifier\", identifier);\r\n      if (DbResult.BE_SQLITE_ROW === statement.step()) {\r\n        elementId = statement.getValue(0).getId();\r\n        aspectId = statement.getValue(1).getId();\r\n      }\r\n    });\r\n    return { elementId, aspectId };\r\n  }\r\n\r\n  /** Look up the elements that contain one or more ExternalSourceAspect with the specified Scope, Kind, and Identifier.\r\n   * The result of this function is an array of all of the ExternalSourceAspects that were found, each associated with the owning element.\r\n   * A given element could have more than one ExternalSourceAspect with the given scope, kind, and identifier.\r\n   * Also, many elements could have ExternalSourceAspect with the same scope, kind, and identifier.\r\n   * Therefore, the result array could have more than one entry with the same elementId.\r\n   * Aspects are never shared. Each aspect has its own unique ECInstanceId.\r\n   * @param iModelDb The iModel to query\r\n   * @param scope    The scope of the ExternalSourceAspects to find\r\n   * @param kind     The kind of the ExternalSourceAspects to find\r\n   * @param identifier The identifier of the ExternalSourceAspects to find\r\n   * @returns the query results\r\n  */\r\n  public static findAllBySource(iModelDb: IModelDb, scope: Id64String, kind: string, identifier: string): Array<{ elementId: Id64String, aspectId: Id64String }> {\r\n    const sql = `SELECT Element.Id, ECInstanceId FROM ${ExternalSourceAspect.classFullName} WHERE (Scope.Id=:scope AND Kind=:kind AND Identifier=:identifier)`;\r\n    const found: Array<{ elementId: Id64String, aspectId: Id64String }> = [];\r\n    iModelDb.withPreparedStatement(sql, (statement: ECSqlStatement) => {\r\n      statement.bindId(\"scope\", scope);\r\n      statement.bindString(\"kind\", kind);\r\n      statement.bindString(\"identifier\", identifier);\r\n      while (DbResult.BE_SQLITE_ROW === statement.step()) {\r\n        found.push({ elementId: statement.getValue(0).getId(), aspectId: statement.getValue(1).getId() });\r\n      }\r\n    });\r\n    return found;\r\n  }\r\n\r\n  /** @internal */\r\n  public override toJSON(): ExternalSourceAspectProps {\r\n    const val = super.toJSON() as ExternalSourceAspectProps;\r\n    val.scope = this.scope;\r\n    val.source = this.source;\r\n    val.identifier = this.identifier;\r\n    val.kind = this.kind;\r\n    val.checksum = this.checksum;\r\n    val.version = this.version;\r\n    val.jsonProperties = this.jsonProperties;\r\n    return val;\r\n  }\r\n\r\n  protected override collectReferenceIds(referenceIds: EntityReferenceSet): void {\r\n    super.collectReferenceIds(referenceIds);\r\n    if (this.scope)\r\n      referenceIds.addElement(this.scope.id);\r\n    referenceIds.addElement(this.element.id);\r\n    if (this.source)\r\n      referenceIds.addElement(this.source.id);\r\n  }\r\n}\r\n\r\n/** @public */\r\nexport namespace ExternalSourceAspect { // eslint-disable-line no-redeclare\r\n  /** Standard values for the `Kind` property of `ExternalSourceAspect`.\r\n   * @public\r\n   */\r\n  export enum Kind {\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing [[Element]] provenance */\r\n    Element = \"Element\",\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing [[Relationship]] provenance */\r\n    Relationship = \"Relationship\",\r\n    /** Indicates that the [[ExternalSourceAspect]] is storing *scope* provenance\r\n     * @see [[ExternalSourceAspect.scope]]\r\n     */\r\n    Scope = \"Scope\",\r\n  }\r\n}\r\n"]}

package/lib/cjs/GeoCoordConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoCoordConfig.d.ts","sourceRoot":"","sources":["../../src/GeoCoordConfig.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAUhD;;;GAGG;AACH,qBAAa,cAAc;IACzB,gFAAgF;IAChF,gBAAuB,UAAU,EAAE,WAAW,CAAC,aAAa,EAAE,CAAM;IAEpE,OAAO,CAAC,MAAM,CAAC,eAAe;IA2C9B,OAAO,CAAC,MAAM,CAAC,OAAO;IAYtB,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAS;WAC3B,SAAS;WAKT,oBAAoB,IAAI,IAAI;WAO5B,aAAa,CAAC,QAAQ,EAAE,QAAQ;CAI/C"}
+{"version":3,"file":"GeoCoordConfig.d.ts","sourceRoot":"","sources":["../../src/GeoCoordConfig.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAUhD;;;GAGG;AACH,qBAAa,cAAc;IACzB,gFAAgF;IAChF,gBAAuB,UAAU,EAAE,WAAW,CAAC,aAAa,EAAE,CAAM;IAEpE,OAAO,CAAC,MAAM,CAAC,eAAe;IAyC9B,OAAO,CAAC,MAAM,CAAC,OAAO;IAYtB,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAS;WAC3B,SAAS;WAKT,oBAAoB,IAAI,IAAI;WAO5B,aAAa,CAAC,QAAQ,EAAE,QAAQ;CAI/C"}

package/lib/cjs/GeoCoordConfig.js

@@ -21,14 +21,12 @@ class GeoCoordConfig {
         // override to disable loading GCS data from workspaces
         if (IModelHost_1.IModelHost.appWorkspace.settings.getBoolean("gcs/disableWorkspaces", false))
             return;
-        let account;
         let containerProps;
         try {
             const ws = IModelHost_1.IModelHost.appWorkspace;
             const dbProps = ws.resolveDatabase(gcsDbAlias);
             containerProps = ws.resolveContainer(dbProps.containerName);
-            account = ws.resolveAccount(containerProps.accountName);
-            const container = ws.getContainer(containerProps, account);
+            const container = ws.getContainer(containerProps);
             const cloudContainer = container.cloudContainer;
             if (!cloudContainer?.isConnected) {
                 core_bentley_1.Logger.logError("GeoCoord", `could not load gcs database "${gcsDbAlias}"`);
@@ -42,14 +40,14 @@ class GeoCoordConfig {
                 return; // already had this db
             if (IModelHost_1.IModelHost.appWorkspace.settings.getBoolean("gcs/noLocalData", false))
                 IModelHost_1.IModelHost.platform.enableLocalGcsFiles(false);
-            core_bentley_1.Logger.logInfo(loggerCat, `loaded gcsDb "${gcsDbName}", from "${account.accessName}/${containerProps.containerId}" size=${gcsDbProps.totalBlocks}, local=${gcsDbProps.localBlocks}`);
+            core_bentley_1.Logger.logInfo(loggerCat, `loaded gcsDb "${gcsDbName}", from "${containerProps.baseUri}/${containerProps.containerId}" size=${gcsDbProps.totalBlocks}, local=${gcsDbProps.localBlocks}`);
             if (true === dbProps.prefetch)
                 this.prefetches.push(CloudSqlite_1.CloudSqlite.startCloudPrefetch(cloudContainer, gcsDbName));
         }
         catch (e) {
             let msg = `Cannot load GCS workspace (${e.errorNumber}): ${core_bentley_1.BentleyError.getErrorMessage(e)}`;
-            if (account && containerProps)
-                msg += `,container=${account.accessName}/${containerProps.containerId}, storage=${account.storageType}, public=${containerProps.isPublic}, cacheDir=${IModelHost_1.IModelHost.cacheDir}`;
+            if (containerProps)
+                msg += `,container=${containerProps.baseUri}/${containerProps.containerId}, storage=${containerProps.storageType}, public=${containerProps.isPublic}, cacheDir=${IModelHost_1.IModelHost.cacheDir}`;
             core_bentley_1.Logger.logError(loggerCat, msg);
         }
     }

package/lib/cjs/GeoCoordConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeoCoordConfig.js","sourceRoot":"","sources":["../../src/GeoCoordConfig.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module iModels\r\n */\r\n\r\nimport { BentleyError, Logger } from \"@itwin/core-bentley\";\r\nimport { CloudSqlite } from \"./CloudSqlite\";\r\nimport { IModelHost } from \"./IModelHost\";\r\nimport { Settings } from \"./workspace/Settings\";\r\nimport { WorkspaceAccount, WorkspaceContainer, WorkspaceDb } from \"./workspace/Workspace\";\r\n\r\nconst loggerCat = \"GeoCoord\";\r\n\r\ninterface GcsDbProps extends WorkspaceDb.Props, WorkspaceContainer.Alias {\r\n  prefetch?: boolean;\r\n  priority?: number;\r\n}\r\n\r\n/**\r\n * Internal class to configure and load the gcs workspaces for an iModel.\r\n * @internal\r\n */\r\nexport class GeoCoordConfig {\r\n  /** array of cloud prefetch tasks that may be awaited to permit offline usage */\r\n  public static readonly prefetches: CloudSqlite.CloudPrefetch[] = [];\r\n\r\n  private static addGcsWorkspace(gcsDbAlias: string) {\r\n    // override to disable loading GCS data from workspaces\r\n    if (IModelHost.appWorkspace.settings.getBoolean(\"gcs/disableWorkspaces\", false))\r\n      return;\r\n\r\n    let account: CloudSqlite.AccountAccessProps | undefined;\r\n    let containerProps: WorkspaceContainer.Props & WorkspaceAccount.Alias | undefined;\r\n    try {\r\n      const ws = IModelHost.appWorkspace;\r\n      const dbProps = ws.resolveDatabase(gcsDbAlias) as GcsDbProps;\r\n      containerProps = ws.resolveContainer(dbProps.containerName);\r\n      account = ws.resolveAccount(containerProps.accountName);\r\n      const container = ws.getContainer(containerProps, account);\r\n      const cloudContainer = container.cloudContainer;\r\n      if (!cloudContainer?.isConnected) {\r\n        Logger.logError(\"GeoCoord\", `could not load gcs database \"${gcsDbAlias}\"`);\r\n        return;\r\n      }\r\n\r\n      const gcsDbName = container.resolveDbFileName(dbProps);\r\n      const gcsDbProps = cloudContainer.queryDatabase(gcsDbName);\r\n      if (undefined === gcsDbProps)\r\n        throw new Error(`database \"${gcsDbName}\" not found in container \"${containerProps.containerId}\"`);\r\n\r\n      if (!IModelHost.platform.addGcsWorkspaceDb(gcsDbName, cloudContainer, dbProps.priority))\r\n        return; // already had this db\r\n\r\n      if (IModelHost.appWorkspace.settings.getBoolean(\"gcs/noLocalData\", false))\r\n        IModelHost.platform.enableLocalGcsFiles(false);\r\n\r\n      Logger.logInfo(loggerCat, `loaded gcsDb \"${gcsDbName}\", from \"${account.accessName}/${containerProps.containerId}\" size=${gcsDbProps.totalBlocks}, local=${gcsDbProps.localBlocks}`);\r\n\r\n      if (true === dbProps.prefetch)\r\n        this.prefetches.push(CloudSqlite.startCloudPrefetch(cloudContainer, gcsDbName));\r\n\r\n    } catch (e: any) {\r\n      let msg = `Cannot load GCS workspace (${e.errorNumber}): ${BentleyError.getErrorMessage(e)}`;\r\n      if (account && containerProps)\r\n        msg += `,container=${account.accessName}/${containerProps.containerId}, storage=${account.storageType}, public=${containerProps.isPublic}, cacheDir=${IModelHost.cacheDir}`;\r\n      Logger.logError(loggerCat, msg);\r\n    }\r\n  }\r\n\r\n  private static loadAll(settings: Settings, settingName: string) {\r\n    settings.resolveSetting(settingName, (val) => {\r\n      if (Array.isArray(val)) {\r\n        for (const entry of val) {\r\n          if (typeof entry === \"string\")\r\n            this.addGcsWorkspace(entry);\r\n        }\r\n      }\r\n      return undefined; // keep going through all dictionaries\r\n    });\r\n  }\r\n\r\n  private static _defaultDbsLoaded = false;\r\n  public static onStartup() {\r\n    this._defaultDbsLoaded = false;\r\n    this.prefetches.length = 0;\r\n  }\r\n\r\n  public static loadDefaultDatabases(): void {\r\n    if (!this._defaultDbsLoaded) {\r\n      this._defaultDbsLoaded = true;\r\n      this.loadAll(IModelHost.appWorkspace.settings, \"gcs/default/databases\");\r\n    }\r\n  }\r\n\r\n  public static loadForImodel(settings: Settings) {\r\n    this.loadDefaultDatabases();\r\n    this.loadAll(settings, \"gcs/databases\");\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"GeoCoordConfig.js","sourceRoot":"","sources":["../../src/GeoCoordConfig.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module iModels\r\n */\r\n\r\nimport { BentleyError, Logger } from \"@itwin/core-bentley\";\r\nimport { CloudSqlite } from \"./CloudSqlite\";\r\nimport { IModelHost } from \"./IModelHost\";\r\nimport { Settings } from \"./workspace/Settings\";\r\nimport { WorkspaceContainer, WorkspaceDb } from \"./workspace/Workspace\";\r\n\r\nconst loggerCat = \"GeoCoord\";\r\n\r\ninterface GcsDbProps extends WorkspaceDb.Props, WorkspaceContainer.Alias {\r\n  prefetch?: boolean;\r\n  priority?: number;\r\n}\r\n\r\n/**\r\n * Internal class to configure and load the gcs workspaces for an iModel.\r\n * @internal\r\n */\r\nexport class GeoCoordConfig {\r\n  /** array of cloud prefetch tasks that may be awaited to permit offline usage */\r\n  public static readonly prefetches: CloudSqlite.CloudPrefetch[] = [];\r\n\r\n  private static addGcsWorkspace(gcsDbAlias: string) {\r\n    // override to disable loading GCS data from workspaces\r\n    if (IModelHost.appWorkspace.settings.getBoolean(\"gcs/disableWorkspaces\", false))\r\n      return;\r\n\r\n    let containerProps: WorkspaceContainer.Props | undefined;\r\n    try {\r\n      const ws = IModelHost.appWorkspace;\r\n      const dbProps = ws.resolveDatabase(gcsDbAlias) as GcsDbProps;\r\n      containerProps = ws.resolveContainer(dbProps.containerName);\r\n      const container = ws.getContainer(containerProps);\r\n      const cloudContainer = container.cloudContainer;\r\n      if (!cloudContainer?.isConnected) {\r\n        Logger.logError(\"GeoCoord\", `could not load gcs database \"${gcsDbAlias}\"`);\r\n        return;\r\n      }\r\n\r\n      const gcsDbName = container.resolveDbFileName(dbProps);\r\n      const gcsDbProps = cloudContainer.queryDatabase(gcsDbName);\r\n      if (undefined === gcsDbProps)\r\n        throw new Error(`database \"${gcsDbName}\" not found in container \"${containerProps.containerId}\"`);\r\n\r\n      if (!IModelHost.platform.addGcsWorkspaceDb(gcsDbName, cloudContainer, dbProps.priority))\r\n        return; // already had this db\r\n\r\n      if (IModelHost.appWorkspace.settings.getBoolean(\"gcs/noLocalData\", false))\r\n        IModelHost.platform.enableLocalGcsFiles(false);\r\n\r\n      Logger.logInfo(loggerCat, `loaded gcsDb \"${gcsDbName}\", from \"${containerProps.baseUri}/${containerProps.containerId}\" size=${gcsDbProps.totalBlocks}, local=${gcsDbProps.localBlocks}`);\r\n\r\n      if (true === dbProps.prefetch)\r\n        this.prefetches.push(CloudSqlite.startCloudPrefetch(cloudContainer, gcsDbName));\r\n\r\n    } catch (e: any) {\r\n      let msg = `Cannot load GCS workspace (${e.errorNumber}): ${BentleyError.getErrorMessage(e)}`;\r\n      if (containerProps)\r\n        msg += `,container=${containerProps.baseUri}/${containerProps.containerId}, storage=${containerProps.storageType}, public=${containerProps.isPublic}, cacheDir=${IModelHost.cacheDir}`;\r\n      Logger.logError(loggerCat, msg);\r\n    }\r\n  }\r\n\r\n  private static loadAll(settings: Settings, settingName: string) {\r\n    settings.resolveSetting(settingName, (val) => {\r\n      if (Array.isArray(val)) {\r\n        for (const entry of val) {\r\n          if (typeof entry === \"string\")\r\n            this.addGcsWorkspace(entry);\r\n        }\r\n      }\r\n      return undefined; // keep going through all dictionaries\r\n    });\r\n  }\r\n\r\n  private static _defaultDbsLoaded = false;\r\n  public static onStartup() {\r\n    this._defaultDbsLoaded = false;\r\n    this.prefetches.length = 0;\r\n  }\r\n\r\n  public static loadDefaultDatabases(): void {\r\n    if (!this._defaultDbsLoaded) {\r\n      this._defaultDbsLoaded = true;\r\n      this.loadAll(IModelHost.appWorkspace.settings, \"gcs/default/databases\");\r\n    }\r\n  }\r\n\r\n  public static loadForImodel(settings: Settings) {\r\n    this.loadDefaultDatabases();\r\n    this.loadAll(settings, \"gcs/databases\");\r\n  }\r\n}\r\n"]}

package/lib/cjs/assets/Settings/Schemas/Cloud.Schema.json

@@ -6,33 +6,6 @@
   "type": "object",
   "groupName": "cloud",
   "properties": {
-    "cloud/accounts": {
-      "type": "array",
-      "description": "array of cloud accounts",
-      "cumulative": true,
-      "items": {
-        "type": "object",
-        "required": [
-          "name",
-          "accessName",
-          "storageType"
-        ],
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "the alias name of the cloud account used in `cloud/container.containerId` values"
-          },
-          "accessName": {
-            "type": "string",
-            "description": "the accessName for the cloud account"
-          },
-          "storageType": {
-            "type": "string",
-            "description": "the storageType of the cloud account"
-          }
-        }
-      }
-    },
     "cloud/containers": {
       "type": "array",
       "description": "array of cloud containers",
@@ -48,13 +21,17 @@
             "type": "string",
             "description": "the alias name of this cloud container"
           },
+          "baseUri": {
+            "type": "string",
+            "description": "the baseUri for the container, without trailing slash (e.g., https://myAcct.blob.core.windows.net)"
+          },
           "containerId": {
             "type": "string",
             "description": "the containerId of this cloud container"
           },
-          "accountName": {
+          "storageType": {
             "type": "string",
-            "description": "the account name for this cloud container. Must be an entry in \"cloud/accounts\" or empty string for local (non-cloud) containers."
+            "description": "one of: 'azure', 'aws', 'google'"
           },
           "isPublic": {
             "type": "boolean",

package/lib/cjs/assets/Settings/backend.setting.json5

@@ -1,15 +1,9 @@
 {
-  "cloud/accounts": [
-    {
-      "name": "gcs/account",
-      "accessName": "https://geocoord-workspace.itwinjs.org",
-      "storageType": "azure?customuri=1&sas=1"
-    }
-  ],
   "cloud/containers": [
     {
       "name": "gcs/container",
-      "accountName": "gcs/account",
+      "baseUri": "https://geocoord-workspace.itwinjs.org",
+      "storageType": "azure",
       "containerId": "gcs",
       "isPublic": true
     }

package/lib/cjs/workspace/Workspace.d.ts

@@ -14,19 +14,6 @@ export declare const WorkspaceSetting: {
     Containers: string;
     Databases: string;
 };
-/** Types used to identify cloud accounts for Workspaces.
- *  @beta
- */
-export declare namespace WorkspaceAccount {
-    /** The name of a WorkspaceAccount in a "cloud/accounts" setting. */
-    type Name = string;
-    /** A member named `accountName` that specifies by an entry in a "cloud/accounts" setting */
-    interface Alias {
-        accountName: string;
-    }
-    /** The properties of a cloud account required to open containers with CloudSqlite. Usually supplied via a "cloud/accounts" setting. */
-    type Props = CloudSqlite.AccountAccessProps;
-}
 /** @beta */
 export declare namespace WorkspaceContainer {
     /** The name of a WorkspaceContainer in a "cloud/containers" setting. */
@@ -45,17 +32,14 @@ export declare namespace WorkspaceContainer {
     }
     /** Properties that specify a WorkspaceContainer. */
     interface Props extends Optional<CloudSqlite.ContainerProps, "accessToken"> {
-        /** true if the container is public (doesn't require authentication) */
-        isPublic?: boolean;
         /** attempt to synchronize (i.e. call `checkForChanges`) this cloud container whenever it is connected to a cloud cache. Default=true */
         syncOnConnect?: boolean;
     }
     /** A function to supply an [AccessToken]($bentley) for a `WorkspaceContainer`.
      * @param props The properties of the WorkspaceContainer necessary to obtain the access token
-     * @param account The properties of the account for the container
      * @returns a Promise that resolves to the AccessToken for the container.
      */
-    type TokenFunc = (props: Props, account: WorkspaceAccount.Props) => Promise<AccessToken>;
+    type TokenFunc = (props: Props) => Promise<AccessToken>;
 }
 /** @beta */
 export declare namespace WorkspaceDb {
@@ -192,18 +176,16 @@ export interface Workspace {
      * Otherwise it is created.
      * @param account If present, the properties for this container if it is to be opened from the cloud. If not present, the container is just a local directory.
     */
-    getContainer(props: WorkspaceContainer.Props, account?: WorkspaceAccount.Props): WorkspaceContainer;
-    /** get the properties for the supplied account name by searching for an entry with that name in a `cloud/accounts` setting. */
-    resolveAccount(accountName: WorkspaceAccount.Name): WorkspaceAccount.Props;
+    getContainer(props: WorkspaceContainer.Props): WorkspaceContainer;
     /** get the properties for the supplied container name by searching for an entry with that name in a `cloud/containers` setting. */
-    resolveContainer(containerName: WorkspaceContainer.Name): WorkspaceContainer.Props & WorkspaceAccount.Alias;
+    resolveContainer(containerName: WorkspaceContainer.Name): WorkspaceContainer.Props;
     /** get the properties for the supplied workspace database name by searching for an entry with that name in a `workspace/databases` setting. */
     resolveDatabase(databaseAlias: WorkspaceDb.Name): WorkspaceDb.Props & WorkspaceContainer.Alias;
     /**
      * Get an opened [[WorkspaceDb]]. If the WorkspaceDb is present but not open, it is opened first.
      * If `cloudProps` are supplied, a CloudContainer will be used to open the WorkspaceDb.
      */
-    getWorkspaceDbFromProps(dbProps: WorkspaceDb.Props, containerProps: WorkspaceContainer.Props, account?: WorkspaceAccount.Props): WorkspaceDb;
+    getWorkspaceDbFromProps(dbProps: WorkspaceDb.Props, containerProps: WorkspaceContainer.Props): WorkspaceDb;
     /** Get an opened [[WorkspaceDb]] from a WorkspaceDb alias.
      * @param dbAlias the database alias, resolved via [[resolveDatabase]].
      * @param tokenFunc optional function to obtain an AccessToken for the resolved WorkspaceContainer. This function will only be called the first
@@ -255,13 +237,12 @@ export declare class ITwinWorkspace implements Workspace {
     constructor(settings: Settings, opts?: WorkspaceOpts);
     addContainer(toAdd: ITwinWorkspaceContainer): void;
     findContainer(containerId: WorkspaceContainer.Id): ITwinWorkspaceContainer | undefined;
-    getContainer(props: WorkspaceContainer.Props, account?: WorkspaceAccount.Props): WorkspaceContainer;
-    getWorkspaceDbFromProps(dbProps: WorkspaceDb.Props, containerProps: WorkspaceContainer.Props, account?: WorkspaceAccount.Props): WorkspaceDb;
+    getContainer(props: WorkspaceContainer.Props): WorkspaceContainer;
+    getWorkspaceDbFromProps(dbProps: WorkspaceDb.Props, containerProps: WorkspaceContainer.Props): WorkspaceDb;
     getWorkspaceDb(dbAlias: string, tokenFunc?: WorkspaceContainer.TokenFunc): Promise<WorkspaceDb>;
     loadSettingsDictionary(settingRsc: WorkspaceResource.Name, db: WorkspaceDb, priority: SettingsPriority): void;
     close(): void;
-    resolveAccount(accountName: string): WorkspaceAccount.Props;
-    resolveContainer(containerName: string): WorkspaceContainer.Props & WorkspaceAccount.Alias;
+    resolveContainer(containerName: string): WorkspaceContainer.Props;
     resolveDatabase(databaseName: string): WorkspaceDb.Props & WorkspaceContainer.Alias;
 }
 /** @internal */
@@ -280,7 +261,7 @@ export declare class ITwinWorkspaceContainer implements WorkspaceContainer {
      */
     private static validateContainerId;
     static validateDbName(dbName: WorkspaceDb.DbName): void;
-    constructor(workspace: ITwinWorkspace, props: WorkspaceContainer.Props, account?: WorkspaceAccount.Props);
+    constructor(workspace: ITwinWorkspace, props: WorkspaceContainer.Props);
     static validateVersion(version?: WorkspaceDb.Version): string;
     static parseDbFileName(dbFileName: WorkspaceDb.DbFullName): {
         dbName: WorkspaceDb.DbName;

package/lib/cjs/workspace/Workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Workspace.d.ts","sourceRoot":"","sources":["../../../src/workspace/Workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Workspace.d.ts","sourceRoot":"","sources":["../../../src/workspace/Workspace.ts"],"names":[],"mappings":"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"}

package/lib/cjs/workspace/Workspace.js

@@ -55,21 +55,20 @@ class ITwinWorkspace {
     findContainer(containerId) {
         return this._containers.get(containerId);
     }
-    getContainer(props, account) {
-        return this.findContainer(props.containerId) ?? new ITwinWorkspaceContainer(this, props, account);
+    getContainer(props) {
+        return this.findContainer(props.containerId) ?? new ITwinWorkspaceContainer(this, props);
     }
-    getWorkspaceDbFromProps(dbProps, containerProps, account) {
-        return this.getContainer(containerProps, account).getWorkspaceDb(dbProps);
+    getWorkspaceDbFromProps(dbProps, containerProps) {
+        return this.getContainer(containerProps).getWorkspaceDb(dbProps);
     }
     async getWorkspaceDb(dbAlias, tokenFunc) {
         const dbProps = this.resolveDatabase(dbAlias);
         const containerProps = this.resolveContainer(dbProps.containerName);
-        const account = containerProps.accountName !== "" ? this.resolveAccount(containerProps.accountName) : undefined;
         let container = this.findContainer(containerProps.containerId);
         if (undefined === container) {
-            if (tokenFunc && account)
-                containerProps.accessToken = await tokenFunc(containerProps, account);
-            container = this.getContainer(containerProps, account);
+            if (tokenFunc)
+                containerProps.accessToken = await tokenFunc(containerProps);
+            container = this.getContainer(containerProps);
         }
         return container?.getWorkspaceDb(dbProps);
     }
@@ -85,20 +84,6 @@ class ITwinWorkspace {
             container.close();
         this._containers.clear();
     }
-    resolveAccount(accountName) {
-        const resolved = this.settings.resolveSetting(exports.WorkspaceSetting.Accounts, (val) => {
-            if (Array.isArray(val)) {
-                for (const entry of val) {
-                    if (typeof entry === "object" && entry.name === accountName)
-                        return SettingsSchemas_1.SettingsSchemas.validateArrayObject(entry, exports.WorkspaceSetting.Accounts, accountName);
-                }
-            }
-            return undefined; // keep going through all settings dictionaries
-        });
-        if (resolved === undefined)
-            throw new Error(`no setting "${exports.WorkspaceSetting.Accounts}" entry for "${accountName}"`);
-        return resolved;
-    }
     resolveContainer(containerName) {
         const resolved = this.settings.resolveSetting(exports.WorkspaceSetting.Containers, (val) => {
             if (Array.isArray(val)) {
@@ -150,13 +135,13 @@ class ITwinWorkspaceContainer {
             throw new Error(`invalid dbName: [${dbName}]`);
         this.noLeadingOrTrailingSpaces(dbName, "dbName");
     }
-    constructor(workspace, props, account) {
+    constructor(workspace, props) {
         this._wsDbs = new Map();
         ITwinWorkspaceContainer.validateContainerId(props.containerId);
         this.workspace = workspace;
         this.id = props.containerId;
-        if (account?.accessName && account.storageType)
-            this.cloudContainer = CloudSqlite_1.CloudSqlite.createCloudContainer({ accessToken: "", ...props, ...account });
+        if (props.baseUri !== "")
+            this.cloudContainer = CloudSqlite_1.CloudSqlite.createCloudContainer({ accessToken: "", ...props });
         workspace.addContainer(this);
         this.filesDir = (0, path_1.join)(this.dirName, "Files");
         const cloudContainer = this.cloudContainer;