@itwin/core-frontend 4.0.0-dev.4 → 4.0.0-dev.40

package/lib/cjs/extension/ExtensionImpl.js

@@ -36,7 +36,7 @@ class ExtensionImpl {
         try {
             IModelApp_1.IModelApp.tools.register(tool);
             appui_abstract_1.UiItemsManager.register(new ToolProvider(tool)); // eslint-disable-line deprecation/deprecation
-            onRegistered === null || onRegistered === void 0 ? void 0 : onRegistered();
+            onRegistered?.();
         }
         catch (e) {
             console.log(`Error registering tool: ${e}`); // eslint-disable-line

package/lib/cjs/extension/ExtensionImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExtensionImpl.js","sourceRoot":"","sources":["../../../src/extension/ExtensionImpl.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,4CAAyC;AACzC,0DAA+J;AAE/J,aAAa;AACb,MAAa,YAAY;IAMvB,YAAmB,IAAc;QAJzB,YAAO,GAAG,EAAE,CAAC;QAKnB,IAAI,CAAC,EAAE,GAAG,gBAAgB,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,UAAkB,EAAE,YAA0B,EAAE,kBAAsC;QACvI,MAAM,WAAW,GAAG,qCAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YACvH,MAAM,qBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,KAAK,2BAAU,CAAC,OAAO,IAAI,YAAY,KAAK,6BAAY,CAAC,mBAAmB,IAAI,kBAAkB,KAAK,mCAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,8CAA8C;IAC1N,CAAC;CACF;AApBD,oCAoBC;AAED,aAAa;AACb,MAAa,aAAa;IACxB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAI,CAAC;IAE7B,KAAK,CAAC,YAAY,CAAC,IAAc,EAAE,YAAwB;QAChE,IAAI;YACF,qBAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/B,+BAAc,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,8CAA8C;YAC/F,YAAY,aAAZ,YAAY,uBAAZ,YAAY,EAAI,CAAC;SAClB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB;SACpE;IACH,CAAC;CACF;AAZD,sCAYC","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 Extensions\r\n */\r\n\r\nimport { ToolType } from \"../tools/Tool\";\r\nimport { IModelApp } from \"../IModelApp\";\r\nimport { CommonToolbarItem, StageUsage, ToolbarItemUtilities, ToolbarOrientation, ToolbarUsage, UiItemsManager, UiItemsProvider } from \"@itwin/appui-abstract\";\r\n\r\n/** @alpha */\r\nexport class ToolProvider implements UiItemsProvider { // eslint-disable-line deprecation/deprecation\r\n  public readonly id;\r\n  private _toolId = \"\";\r\n  private _toolIcon;\r\n  private _toolLabel;\r\n\r\n  public constructor(tool: ToolType) {\r\n    this.id = `ToolProvider:${tool.toolId}`;\r\n    this._toolId = tool.toolId;\r\n    this._toolIcon = tool.iconSpec;\r\n    this._toolLabel = tool.description;\r\n  }\r\n\r\n  public provideToolbarButtonItems(_stageId: string, stageUsage: string, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation): CommonToolbarItem[] { // eslint-disable-line deprecation/deprecation\r\n    const toolbarItem = ToolbarItemUtilities.createActionButton(this._toolId, 0, this._toolIcon, this._toolLabel, async () => {\r\n      await IModelApp.tools.run(this._toolId);\r\n    });\r\n\r\n    return stageUsage === StageUsage.General && toolbarUsage === ToolbarUsage.ContentManipulation && toolbarOrientation === ToolbarOrientation.Vertical ? [toolbarItem] : []; // eslint-disable-line deprecation/deprecation\r\n  }\r\n}\r\n\r\n/** @alpha */\r\nexport class ExtensionImpl {\r\n  constructor(private _id: string) { }\r\n\r\n  public async registerTool(tool: ToolType, onRegistered?: () => any): Promise<void> {\r\n    try {\r\n      IModelApp.tools.register(tool);\r\n      UiItemsManager.register(new ToolProvider(tool)); // eslint-disable-line deprecation/deprecation\r\n      onRegistered?.();\r\n    } catch (e: any) {\r\n      console.log(`Error registering tool: ${e}`); // eslint-disable-line\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ExtensionImpl.js","sourceRoot":"","sources":["../../../src/extension/ExtensionImpl.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,4CAAyC;AACzC,0DAA+J;AAE/J,aAAa;AACb,MAAa,YAAY;IAMvB,YAAmB,IAAc;QAJzB,YAAO,GAAG,EAAE,CAAC;QAKnB,IAAI,CAAC,EAAE,GAAG,gBAAgB,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;IACrC,CAAC;IAEM,yBAAyB,CAAC,QAAgB,EAAE,UAAkB,EAAE,YAA0B,EAAE,kBAAsC;QACvI,MAAM,WAAW,GAAG,qCAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YACvH,MAAM,qBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,KAAK,2BAAU,CAAC,OAAO,IAAI,YAAY,KAAK,6BAAY,CAAC,mBAAmB,IAAI,kBAAkB,KAAK,mCAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,8CAA8C;IAC1N,CAAC;CACF;AApBD,oCAoBC;AAED,aAAa;AACb,MAAa,aAAa;IACxB,YAAoB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAI,CAAC;IAE7B,KAAK,CAAC,YAAY,CAAC,IAAc,EAAE,YAAwB;QAChE,IAAI;YACF,qBAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/B,+BAAc,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,8CAA8C;YAC/F,YAAY,EAAE,EAAE,CAAC;SAClB;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB;SACpE;IACH,CAAC;CACF;AAZD,sCAYC","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 Extensions\r\n */\r\n\r\nimport { ToolType } from \"../tools/Tool\";\r\nimport { IModelApp } from \"../IModelApp\";\r\nimport { CommonToolbarItem, StageUsage, ToolbarItemUtilities, ToolbarOrientation, ToolbarUsage, UiItemsManager, UiItemsProvider } from \"@itwin/appui-abstract\";\r\n\r\n/** @alpha */\r\nexport class ToolProvider implements UiItemsProvider { // eslint-disable-line deprecation/deprecation\r\n  public readonly id;\r\n  private _toolId = \"\";\r\n  private _toolIcon;\r\n  private _toolLabel;\r\n\r\n  public constructor(tool: ToolType) {\r\n    this.id = `ToolProvider:${tool.toolId}`;\r\n    this._toolId = tool.toolId;\r\n    this._toolIcon = tool.iconSpec;\r\n    this._toolLabel = tool.description;\r\n  }\r\n\r\n  public provideToolbarButtonItems(_stageId: string, stageUsage: string, toolbarUsage: ToolbarUsage, toolbarOrientation: ToolbarOrientation): CommonToolbarItem[] { // eslint-disable-line deprecation/deprecation\r\n    const toolbarItem = ToolbarItemUtilities.createActionButton(this._toolId, 0, this._toolIcon, this._toolLabel, async () => {\r\n      await IModelApp.tools.run(this._toolId);\r\n    });\r\n\r\n    return stageUsage === StageUsage.General && toolbarUsage === ToolbarUsage.ContentManipulation && toolbarOrientation === ToolbarOrientation.Vertical ? [toolbarItem] : []; // eslint-disable-line deprecation/deprecation\r\n  }\r\n}\r\n\r\n/** @alpha */\r\nexport class ExtensionImpl {\r\n  constructor(private _id: string) { }\r\n\r\n  public async registerTool(tool: ToolType, onRegistered?: () => any): Promise<void> {\r\n    try {\r\n      IModelApp.tools.register(tool);\r\n      UiItemsManager.register(new ToolProvider(tool)); // eslint-disable-line deprecation/deprecation\r\n      onRegistered?.();\r\n    } catch (e: any) {\r\n      console.log(`Error registering tool: ${e}`); // eslint-disable-line\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/cjs/quantity-formatting/BaseUnitFormattingSettingsProvider.js

@@ -69,9 +69,8 @@ class BaseUnitFormattingSettingsProvider {
             await this.applyQuantityFormattingSettingsForIModel(imodel);
         };
         this.handleViewportChanged = async (args) => {
-            var _a, _b, _c, _d, _e;
-            if (((_a = args.current) === null || _a === void 0 ? void 0 : _a.iModel) && (((_c = (_b = args.current) === null || _b === void 0 ? void 0 : _b.iModel) === null || _c === void 0 ? void 0 : _c.iModelId) !== ((_d = this.imodelConnection) === null || _d === void 0 ? void 0 : _d.iModelId))) {
-                await this.applyQuantityFormattingSettingsForIModel((_e = args.current) === null || _e === void 0 ? void 0 : _e.iModel);
+            if (args.current?.iModel && (args.current?.iModel?.iModelId !== this.imodelConnection?.iModelId)) {
+                await this.applyQuantityFormattingSettingsForIModel(args.current?.iModel);
             }
         };
         this.handleIModelClose = async () => {

package/lib/cjs/quantity-formatting/BaseUnitFormattingSettingsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseUnitFormattingSettingsProvider.js","sourceRoot":"","sources":["../../../src/quantity-formatting/BaseUnitFormattingSettingsProvider.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 QuantityFormatting\r\n */\r\n\r\nimport { FormatProps, UnitSystemKey } from \"@itwin/core-quantity\";\r\nimport { IModelApp } from \"../IModelApp\";\r\nimport { IModelConnection } from \"../IModelConnection\";\r\nimport { SelectedViewportChangedArgs } from \"../ViewManager\";\r\nimport {\r\n  FormattingUnitSystemChangedArgs, OverrideFormatEntry, QuantityFormatOverridesChangedArgs, QuantityFormatter,\r\n  QuantityTypeKey, UnitFormattingSettingsProvider,\r\n} from \"./QuantityFormatter\";\r\n\r\n/** This abstract class reacts to changes in the \"active\" iModel and updates the [[QuantityFormatter]] overrides and active\r\n * presentation unit system based on stored preferences.  In addition, monitors the [[QuantityFormatter]] for changes to format overrides and the active\r\n * unit system and stores these changes. The \"active\" iModel is determined by listening to the `IModelApp.viewManager.onSelectedViewportChanged` event\r\n * and gets the iModel from the selected viewport.\r\n * @beta\r\n */\r\nexport abstract class BaseUnitFormattingSettingsProvider implements UnitFormattingSettingsProvider {\r\n  protected _imodelConnection: IModelConnection | undefined;\r\n\r\n  /**\r\n   * @param maintainOverridesPerIModel If maintainOverridesPerIModel is true the base class will set up listeners\r\n   * to monitor \"active\" iModel changes so the overrides for the QuantityFormatter properly match the overrides set\r\n   * up by the user. If false then the overrides are maintained only per user.\r\n   * @beta\r\n   */\r\n  constructor(private _quantityFormatter: QuantityFormatter, private _maintainOverridesPerIModel?: boolean) {\r\n    if (this._maintainOverridesPerIModel) {\r\n      IModelApp.viewManager.onSelectedViewportChanged.addListener(this.handleViewportChanged);\r\n      IModelConnection.onOpen.addListener(this.handleIModelOpen);\r\n      IModelConnection.onClose.addListener(this.handleIModelClose);\r\n    }\r\n  }\r\n\r\n  public get maintainOverridesPerIModel(): boolean {\r\n    return !!this._maintainOverridesPerIModel;\r\n  }\r\n\r\n  public storeFormatOverrides = async ({typeKey, overrideEntry, unitSystem}: QuantityFormatOverridesChangedArgs) => {\r\n    if (undefined === overrideEntry) {\r\n      // remove all overrides for quantity type\r\n      if (undefined === unitSystem) {\r\n        await this.remove (typeKey);\r\n        return;\r\n      }else {\r\n        // remove only system specific overrides for quantity type\r\n        const storedJson = await this.retrieve (typeKey);\r\n        if (storedJson) {\r\n          delete storedJson[unitSystem];\r\n          if (Object.keys(storedJson).length) {\r\n            await this.store (typeKey, storedJson);\r\n          } else {\r\n            await this.remove (typeKey);\r\n          }\r\n        }\r\n      }\r\n    } else {\r\n      // setting a new override or set of overrides\r\n      const storedJson = await this.retrieve (typeKey);\r\n      const updatedFormat = {...storedJson, ...overrideEntry};\r\n      await this.store (typeKey, updatedFormat);\r\n    }\r\n  };\r\n\r\n  /** save UnitSystem for active iModel */\r\n  public storeUnitSystemSetting = async ({system}: FormattingUnitSystemChangedArgs) => {\r\n    await this.storeUnitSystemKey(system);\r\n  };\r\n\r\n  public async loadOverrides(imodel?: IModelConnection): Promise<void> {\r\n    await this.applyQuantityFormattingSettingsForIModel(imodel);\r\n  }\r\n\r\n  protected applyQuantityFormattingSettingsForIModel = async (imodel?: IModelConnection) => {\r\n    if (this._maintainOverridesPerIModel)\r\n      this._imodelConnection = imodel;\r\n    const overrideFormatProps = await this.buildQuantityFormatOverridesMap();\r\n    const unitSystemKey = await this.retrieveUnitSystem (this._quantityFormatter.activeUnitSystem);\r\n    await this._quantityFormatter.reinitializeFormatAndParsingsMaps(overrideFormatProps, unitSystemKey, true, true);\r\n  };\r\n\r\n  private handleIModelOpen = async (imodel: IModelConnection) => {\r\n    await this.applyQuantityFormattingSettingsForIModel (imodel);\r\n  };\r\n\r\n  private handleViewportChanged = async (args: SelectedViewportChangedArgs) => {\r\n    if(args.current?.iModel && (args.current?.iModel?.iModelId !== this.imodelConnection?.iModelId)) {\r\n      await this.applyQuantityFormattingSettingsForIModel (args.current?.iModel);\r\n    }\r\n  };\r\n\r\n  private handleIModelClose = async () => {\r\n    this._imodelConnection = undefined;\r\n  };\r\n\r\n  protected get imodelConnection() {\r\n    return  this._imodelConnection;\r\n  }\r\n\r\n  /** function to convert from serialized JSON format for Quantity Type overrides to build a map compatible with QuantityManager */\r\n  protected async buildQuantityFormatOverridesMap() {\r\n    const overrideFormatProps = new Map<UnitSystemKey, Map<QuantityTypeKey, FormatProps>>();\r\n\r\n    // use map and await all returned promises - overrides are stored by QuantityType\r\n    for await (const quantityTypeKey of [...this._quantityFormatter.quantityTypesRegistry.keys()]) {\r\n      const quantityTypeDef = this._quantityFormatter.quantityTypesRegistry.get(quantityTypeKey);\r\n      if (quantityTypeDef) {\r\n        const typeKey = quantityTypeDef.key;\r\n        const overrideEntry = await this.retrieve (typeKey);\r\n        if (overrideEntry) {\r\n          // extract overrides and insert into appropriate override map entry\r\n          Object.keys(overrideEntry).forEach ((systemKey) => {\r\n            const unitSystemKey = systemKey as UnitSystemKey;\r\n            const props = overrideEntry[unitSystemKey];\r\n            if (props) {\r\n              if (overrideFormatProps.has(unitSystemKey)) {\r\n                overrideFormatProps.get(unitSystemKey)!.set(typeKey, props);\r\n              } else {\r\n                const newMap = new Map<string, FormatProps>();\r\n                newMap.set(typeKey, props);\r\n                overrideFormatProps.set(unitSystemKey, newMap);\r\n              }\r\n            }\r\n          });\r\n        }\r\n      }\r\n    }\r\n    return overrideFormatProps;\r\n  }\r\n\r\n  /** Serializes JSON object containing format overrides for a specific quantity type. */\r\n  abstract store(quantityTypeKey: QuantityTypeKey, overrideProps: OverrideFormatEntry): Promise<boolean>;\r\n\r\n  /** Retrieves serialized JSON object containing format overrides for a specific quantity type. */\r\n  abstract retrieve(quantityTypeKey: QuantityTypeKey): Promise<OverrideFormatEntry|undefined>;\r\n\r\n  /** Removes the override formats for a specific quantity type. */\r\n  abstract remove(quantityTypeKey: QuantityTypeKey): Promise<boolean>;\r\n\r\n  /** Retrieves the active unit system typically based on the \"active\" iModelConnection. */\r\n  abstract  retrieveUnitSystem(defaultKey: UnitSystemKey): Promise<UnitSystemKey>;\r\n\r\n  /** Store the active unit system typically for the \"active\" iModelConnection. */\r\n  abstract  storeUnitSystemKey(unitSystemKey: UnitSystemKey): Promise<boolean>;\r\n}\r\n\r\n"]}
+{"version":3,"file":"BaseUnitFormattingSettingsProvider.js","sourceRoot":"","sources":["../../../src/quantity-formatting/BaseUnitFormattingSettingsProvider.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 QuantityFormatting\r\n */\r\n\r\nimport { FormatProps, UnitSystemKey } from \"@itwin/core-quantity\";\r\nimport { IModelApp } from \"../IModelApp\";\r\nimport { IModelConnection } from \"../IModelConnection\";\r\nimport { SelectedViewportChangedArgs } from \"../ViewManager\";\r\nimport {\r\n  FormattingUnitSystemChangedArgs, OverrideFormatEntry, QuantityFormatOverridesChangedArgs, QuantityFormatter,\r\n  QuantityTypeKey, UnitFormattingSettingsProvider,\r\n} from \"./QuantityFormatter\";\r\n\r\n/** This abstract class reacts to changes in the \"active\" iModel and updates the [[QuantityFormatter]] overrides and active\r\n * presentation unit system based on stored preferences.  In addition, monitors the [[QuantityFormatter]] for changes to format overrides and the active\r\n * unit system and stores these changes. The \"active\" iModel is determined by listening to the `IModelApp.viewManager.onSelectedViewportChanged` event\r\n * and gets the iModel from the selected viewport.\r\n * @beta\r\n */\r\nexport abstract class BaseUnitFormattingSettingsProvider implements UnitFormattingSettingsProvider {\r\n  protected _imodelConnection: IModelConnection | undefined;\r\n\r\n  /**\r\n   * @param maintainOverridesPerIModel If maintainOverridesPerIModel is true the base class will set up listeners\r\n   * to monitor \"active\" iModel changes so the overrides for the QuantityFormatter properly match the overrides set\r\n   * up by the user. If false then the overrides are maintained only per user.\r\n   * @beta\r\n   */\r\n  constructor(private _quantityFormatter: QuantityFormatter, private _maintainOverridesPerIModel?: boolean) {\r\n    if (this._maintainOverridesPerIModel) {\r\n      IModelApp.viewManager.onSelectedViewportChanged.addListener(this.handleViewportChanged);\r\n      IModelConnection.onOpen.addListener(this.handleIModelOpen);\r\n      IModelConnection.onClose.addListener(this.handleIModelClose);\r\n    }\r\n  }\r\n\r\n  public get maintainOverridesPerIModel(): boolean {\r\n    return !!this._maintainOverridesPerIModel;\r\n  }\r\n\r\n  public storeFormatOverrides = async ({typeKey, overrideEntry, unitSystem}: QuantityFormatOverridesChangedArgs) => {\r\n    if (undefined === overrideEntry) {\r\n      // remove all overrides for quantity type\r\n      if (undefined === unitSystem) {\r\n        await this.remove (typeKey);\r\n        return;\r\n      }else {\r\n        // remove only system specific overrides for quantity type\r\n        const storedJson = await this.retrieve (typeKey);\r\n        if (storedJson) {\r\n          delete storedJson[unitSystem];\r\n          if (Object.keys(storedJson).length) {\r\n            await this.store (typeKey, storedJson);\r\n          } else {\r\n            await this.remove (typeKey);\r\n          }\r\n        }\r\n      }\r\n    } else {\r\n      // setting a new override or set of overrides\r\n      const storedJson = await this.retrieve (typeKey);\r\n      const updatedFormat = {...storedJson, ...overrideEntry};\r\n      await this.store (typeKey, updatedFormat);\r\n    }\r\n  };\r\n\r\n  /** save UnitSystem for active iModel */\r\n  public storeUnitSystemSetting = async ({system}: FormattingUnitSystemChangedArgs) => {\r\n    await this.storeUnitSystemKey(system);\r\n  };\r\n\r\n  public async loadOverrides(imodel?: IModelConnection): Promise<void> {\r\n    await this.applyQuantityFormattingSettingsForIModel(imodel);\r\n  }\r\n\r\n  protected applyQuantityFormattingSettingsForIModel = async (imodel?: IModelConnection) => {\r\n    if (this._maintainOverridesPerIModel)\r\n      this._imodelConnection = imodel;\r\n    const overrideFormatProps = await this.buildQuantityFormatOverridesMap();\r\n    const unitSystemKey = await this.retrieveUnitSystem (this._quantityFormatter.activeUnitSystem);\r\n    await this._quantityFormatter.reinitializeFormatAndParsingsMaps(overrideFormatProps, unitSystemKey, true, true);\r\n  };\r\n\r\n  private handleIModelOpen = async (imodel: IModelConnection) => {\r\n    await this.applyQuantityFormattingSettingsForIModel (imodel);\r\n  };\r\n\r\n  private handleViewportChanged = async (args: SelectedViewportChangedArgs) => {\r\n    if(args.current?.iModel && (args.current?.iModel?.iModelId !== this.imodelConnection?.iModelId)) {\r\n      await this.applyQuantityFormattingSettingsForIModel (args.current?.iModel);\r\n    }\r\n  };\r\n\r\n  private handleIModelClose = async () => {\r\n    this._imodelConnection = undefined;\r\n  };\r\n\r\n  protected get imodelConnection() {\r\n    return  this._imodelConnection;\r\n  }\r\n\r\n  /** function to convert from serialized JSON format for Quantity Type overrides to build a map compatible with QuantityManager */\r\n  protected async buildQuantityFormatOverridesMap() {\r\n    const overrideFormatProps = new Map<UnitSystemKey, Map<QuantityTypeKey, FormatProps>>();\r\n\r\n    // use map and await all returned promises - overrides are stored by QuantityType\r\n    for await (const quantityTypeKey of [...this._quantityFormatter.quantityTypesRegistry.keys()]) {\r\n      const quantityTypeDef = this._quantityFormatter.quantityTypesRegistry.get(quantityTypeKey);\r\n      if (quantityTypeDef) {\r\n        const typeKey = quantityTypeDef.key;\r\n        const overrideEntry = await this.retrieve (typeKey);\r\n        if (overrideEntry) {\r\n          // extract overrides and insert into appropriate override map entry\r\n          Object.keys(overrideEntry).forEach ((systemKey) => {\r\n            const unitSystemKey = systemKey as UnitSystemKey;\r\n            const props = overrideEntry[unitSystemKey];\r\n            if (props) {\r\n              if (overrideFormatProps.has(unitSystemKey)) {\r\n                overrideFormatProps.get(unitSystemKey)!.set(typeKey, props);\r\n              } else {\r\n                const newMap = new Map<string, FormatProps>();\r\n                newMap.set(typeKey, props);\r\n                overrideFormatProps.set(unitSystemKey, newMap);\r\n              }\r\n            }\r\n          });\r\n        }\r\n      }\r\n    }\r\n    return overrideFormatProps;\r\n  }\r\n\r\n  /** Serializes JSON object containing format overrides for a specific quantity type. */\r\n  abstract store(quantityTypeKey: QuantityTypeKey, overrideProps: OverrideFormatEntry): Promise<boolean>;\r\n\r\n  /** Retrieves serialized JSON object containing format overrides for a specific quantity type. */\r\n  abstract retrieve(quantityTypeKey: QuantityTypeKey): Promise<OverrideFormatEntry|undefined>;\r\n\r\n  /** Removes the override formats for a specific quantity type. */\r\n  abstract remove(quantityTypeKey: QuantityTypeKey): Promise<boolean>;\r\n\r\n  /** Retrieves the active unit system typically based on the \"active\" iModelConnection. */\r\n  abstract  retrieveUnitSystem(defaultKey: UnitSystemKey): Promise<UnitSystemKey>;\r\n\r\n  /** Store the active unit system typically for the \"active\" iModelConnection. */\r\n  abstract  storeUnitSystemKey(unitSystemKey: UnitSystemKey): Promise<boolean>;\r\n}\r\n\r\n"]}

package/lib/cjs/quantity-formatting/QuantityFormatter.js

@@ -52,7 +52,7 @@ class AlternateUnitLabelsRegistry {
         }
     }
     addAlternateLabels(key, ...labels) {
-        [...labels].forEach((value) => { var _a; return (_a = this._alternateLabelRegistry.get(key)) === null || _a === void 0 ? void 0 : _a.add(value); });
+        [...labels].forEach((value) => this._alternateLabelRegistry.get(key)?.add(value));
     }
     getAlternateUnitLabels(unit) {
         const key = unit.name;
@@ -93,18 +93,16 @@ class StandardQuantityTypeDefinition {
     }
     get key() { return this._key; }
     get label() {
-        var _a;
         if (!this._label) {
             this._label = IModelApp_1.IModelApp.localization.getLocalizedString(this._labelKey);
         }
-        return (_a = this._label) !== null && _a !== void 0 ? _a : "";
+        return this._label ?? "";
     }
     get description() {
-        var _a;
         if (!this._description) {
             this._description = IModelApp_1.IModelApp.localization.getLocalizedString(this._descriptionKey);
         }
-        return (_a = this._description) !== null && _a !== void 0 ? _a : this.label;
+        return this._description ?? this.label;
     }
     /** Get a default format to show quantity in persistence unit with precision or 6 decimal places.  */
     getDefaultFormatPropsBySystem(requestedSystem) {
@@ -190,7 +188,7 @@ class QuantityFormatter {
             await provider.loadOverrides(undefined);
     }
     getOverrideFormatPropsByQuantityType(quantityTypeKey, unitSystem) {
-        const requestedUnitSystem = unitSystem !== null && unitSystem !== void 0 ? unitSystem : this.activeUnitSystem;
+        const requestedUnitSystem = unitSystem ?? this.activeUnitSystem;
         const overrideMap = this._overrideFormatPropsByUnitSystem.get(requestedUnitSystem);
         if (!overrideMap)
             return undefined;
@@ -491,7 +489,7 @@ class QuantityFormatter {
      */
     async getFormatterSpecByQuantityTypeAndSystem(type, system) {
         const quantityKey = this.getQuantityTypeKey(type);
-        const requestedSystem = system !== null && system !== void 0 ? system : this.activeUnitSystem;
+        const requestedSystem = system ?? this.activeUnitSystem;
         if (requestedSystem === this.activeUnitSystem) {
             const formatterSpec = this._activeFormatSpecsByType.get(quantityKey);
             if (formatterSpec)
@@ -522,7 +520,7 @@ class QuantityFormatter {
     /** Asynchronous Call to get a ParserSpec for a QuantityType. If the UnitSystemKey is not specified the active Unit System is used. **/
     async getParserSpecByQuantityTypeAndSystem(type, system) {
         const quantityKey = this.getQuantityTypeKey(type);
-        const requestedSystem = system !== null && system !== void 0 ? system : this.activeUnitSystem;
+        const requestedSystem = system ?? this.activeUnitSystem;
         if (requestedSystem === this.activeUnitSystem) {
             const parserSpec = this._activeParserSpecsByType.get(quantityKey);
             if (parserSpec)
@@ -613,7 +611,7 @@ class QuantityFormatter {
     getFormatPropsByQuantityType(quantityType, requestedSystem, ignoreOverrides) {
         const quantityEntry = this.quantityTypesRegistry.get(this.getQuantityTypeKey(quantityType));
         if (quantityEntry)
-            return this.getFormatPropsByQuantityTypeEntryAndSystem(quantityEntry, requestedSystem !== null && requestedSystem !== void 0 ? requestedSystem : this.activeUnitSystem, ignoreOverrides);
+            return this.getFormatPropsByQuantityTypeEntryAndSystem(quantityEntry, requestedSystem ?? this.activeUnitSystem, ignoreOverrides);
         return undefined;
     }
     // keep following to maintain existing API of implementing UnitsProvider