add consistent type import eslint rule

clients/imodelhub/package.json

@@ -20,6 +20,7 @@
     "extract-api": "",
     "docs": "",
     "lint": "eslint -f visualstudio \"./src/**/*.ts\" 1>&2",
+    "lint:fix": "npm run -s lint -- --fix",
     "test": "mocha",
     "cover": ""
   },

clients/imodelhub/src/IModelAccessContext.ts

@@ -5,7 +5,7 @@
 /** @packageDocumentation
  * @module iModelHubClient
  */
-import { IModelClient } from "./IModelClient";
+import type { IModelClient } from "./IModelClient";
 
 export abstract class IModelAccessContext {
   public abstract get client(): IModelClient | undefined;

clients/imodelhub/src/IModelClient.ts

@@ -5,21 +5,22 @@
 /** @packageDocumentation
  * @module iModelHubClient
  */
-import { FileHandler } from "./itwin-client/FileHandler";
-import { addApplicationVersion, HttpRequestOptionsTransformer, IModelBaseHandler } from "./imodelhub/BaseHandler";
+import type { FileHandler } from "./itwin-client/FileHandler";
+import type { HttpRequestOptionsTransformer, IModelBaseHandler } from "./imodelhub/BaseHandler";
+import { addApplicationVersion } from "./imodelhub/BaseHandler";
 import { BriefcaseHandler } from "./imodelhub/Briefcases";
 import { ChangeSetHandler } from "./imodelhub/ChangeSets";
 import { CheckpointHandler } from "./imodelhub/Checkpoints";
 import { CodeHandler } from "./imodelhub/Codes";
-import { CustomRequestOptions } from "./imodelhub/CustomRequestOptions";
+import type { CustomRequestOptions } from "./imodelhub/CustomRequestOptions";
 import { EventHandler } from "./imodelhub/Events";
 import { GlobalEventHandler } from "./imodelhub/GlobalEvents";
 import { IModelHandler, IModelsHandler } from "./imodelhub/iModels";
 import { LockHandler } from "./imodelhub/Locks";
 import { ThumbnailHandler } from "./imodelhub/Thumbnails";
 import { UserInfoHandler } from "./imodelhub/Users";
 import { VersionHandler } from "./imodelhub/Versions";
-import { PermissionHandler } from "./imodelhub/Permissions";
+import type { PermissionHandler } from "./imodelhub/Permissions";
 import { CheckpointV2Handler } from "./imodelhub/CheckpointsV2";
 
 /**

clients/imodelhub/src/IModelCloudEnvironment.ts

@@ -6,10 +6,10 @@
  * @module iModelHubClient
  */
 
-import { AccessToken } from "@itwin/core-bentley";
-import { Project as ITwin } from "@itwin/projects-client";
-import { AuthorizationClient } from "@itwin/core-common";
-import { IModelClient } from "./IModelClient";
+import type { AccessToken } from "@itwin/core-bentley";
+import type { Project as ITwin } from "@itwin/projects-client";
+import type { AuthorizationClient } from "@itwin/core-common";
+import type { IModelClient } from "./IModelClient";
 
 /** How to discover iTwins
  * @internal

clients/imodelhub/src/IModelHub.ts

@@ -3,13 +3,16 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 
-import { AccessToken, BentleyError, BentleyStatus, GuidString } from "@itwin/core-bentley";
-import { FrontendHubAccess, IModelIdArg } from "@itwin/core-frontend"; // All of the imports from both frontend and common must be only of interfaces.
-import { BriefcaseId, ChangesetIndexAndId, IModelVersion } from "@itwin/core-common";
+import type { AccessToken, GuidString } from "@itwin/core-bentley";
+import { BentleyError, BentleyStatus } from "@itwin/core-bentley";
+import type { FrontendHubAccess, IModelIdArg } from "@itwin/core-frontend"; // All of the imports from both frontend and common must be only of interfaces.
+import type { BriefcaseId, ChangesetIndexAndId, IModelVersion } from "@itwin/core-common";
 import { BriefcaseQuery } from "./imodelhub/Briefcases";
-import { ChangeSet, ChangeSetQuery } from "./imodelhub/ChangeSets";
+import type { ChangeSet} from "./imodelhub/ChangeSets";
+import { ChangeSetQuery } from "./imodelhub/ChangeSets";
 import { IModelHubClient } from "./imodelhub/Client";
-import { Version, VersionQuery } from "./imodelhub/Versions";
+import type { Version} from "./imodelhub/Versions";
+import { VersionQuery } from "./imodelhub/Versions";
 import { IModelQuery } from "./imodelhub/iModels";
 
 // TODO: Replace with types from imodeljs-backend once its dep is removed on this client

clients/imodelhub/src/IModelHubBackend.ts

@@ -8,26 +8,31 @@
 
 import { join } from "path";
 import { UserCancelledError } from "./itwin-client/FileHandler";
-import { ProgressCallback, ProgressInfo } from "./itwin-client/Request";
-import {
-  AcquireNewBriefcaseIdArg, BackendHubAccess, BriefcaseDbArg, BriefcaseIdArg, BriefcaseLocalValue, BriefcaseManager, ChangesetArg, ChangesetRangeArg, CheckpointArg,
-  CheckpointProps, CreateNewIModelProps, IModelDb, IModelHost, IModelIdArg, IModelJsFs, IModelNameArg, ITwinIdArg, LockMap, LockProps, LockState, SnapshotDb, TokenArg,
-  V2CheckpointAccessProps,
+import type { ProgressCallback, ProgressInfo } from "./itwin-client/Request";
+import type {
+  AcquireNewBriefcaseIdArg, BackendHubAccess, BriefcaseDbArg, BriefcaseIdArg, ChangesetArg, ChangesetRangeArg, CheckpointArg,
+  CheckpointProps, CreateNewIModelProps, IModelIdArg, IModelNameArg, ITwinIdArg, LockMap, LockProps, LockState, TokenArg,
+  V2CheckpointAccessProps} from "@itwin/core-backend";
+import { BriefcaseLocalValue, BriefcaseManager, IModelDb, IModelHost, IModelJsFs, SnapshotDb,
 } from "@itwin/core-backend";
-import { BentleyError, BriefcaseStatus, GuidString, Id64String, IModelHubStatus, IModelStatus, Logger, OpenMode } from "@itwin/core-bentley";
+import type { GuidString, Id64String} from "@itwin/core-bentley";
+import { BentleyError, BriefcaseStatus, IModelHubStatus, IModelStatus, Logger, OpenMode } from "@itwin/core-bentley";
+import type { ChangesetFileProps, ChangesetId, ChangesetIndex, ChangesetIndexAndId, ChangesetProps, CodeProps, IModelVersion, LocalDirName} from "@itwin/core-common";
 import {
-  BriefcaseIdValue, ChangesetFileProps, ChangesetId, ChangesetIndex, ChangesetIndexAndId, ChangesetProps, CodeProps, IModelError, IModelVersion, LocalDirName,
+  BriefcaseIdValue, IModelError,
 } from "@itwin/core-common";
 import { IModelBankClient } from "./imodelbank/IModelBankClient";
-import { IModelClient } from "./IModelClient";
+import type { IModelClient } from "./IModelClient";
 import { BriefcaseQuery } from "./imodelhub/Briefcases";
 import { ChangeSet, ChangeSetQuery, ChangesType } from "./imodelhub/ChangeSets";
 import { CheckpointQuery } from "./imodelhub/Checkpoints";
-import { CheckpointV2, CheckpointV2Query } from "./imodelhub/CheckpointsV2";
+import type { CheckpointV2} from "./imodelhub/CheckpointsV2";
+import { CheckpointV2Query } from "./imodelhub/CheckpointsV2";
 import { IModelHubClient } from "./imodelhub/Client";
 import { CodeQuery } from "./imodelhub/Codes";
 import { IModelQuery } from "./imodelhub/iModels";
-import { Lock, LockLevel, LockQuery, LockType } from "./imodelhub/Locks";
+import type { LockLevel} from "./imodelhub/Locks";
+import { Lock, LockQuery, LockType } from "./imodelhub/Locks";
 import { VersionQuery } from "./imodelhub/Versions";
 import { AzureFileHandler } from "./itwin-client/AzureFileHandler";
 

clients/imodelhub/src/imodelbank/IModelBankBasicAuthorizationClient.ts

@@ -2,8 +2,9 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-import { AccessToken, BeEvent } from "@itwin/core-bentley";
-import { AuthorizationClient } from "@itwin/core-common";
+import type { AccessToken} from "@itwin/core-bentley";
+import { BeEvent } from "@itwin/core-bentley";
+import type { AuthorizationClient } from "@itwin/core-common";
 /** @packageDocumentation
  * @module iModelBankClient
  */

clients/imodelhub/src/imodelbank/IModelBankClient.ts

@@ -5,7 +5,7 @@
 /** @packageDocumentation
  * @module iModelBankClient
  */
-import { FileHandler } from "../itwin-client/FileHandler";
+import type { FileHandler } from "../itwin-client/FileHandler";
 import { IModelClient } from "../IModelClient";
 import { IModelBankHandler } from "./IModelBankHandler";
 

clients/imodelhub/src/imodelbank/IModelBankDummyAuthorizationClient.ts

@@ -2,8 +2,9 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-import { AccessToken, BeEvent } from "@itwin/core-bentley";
-import { AuthorizationClient } from "@itwin/core-common";
+import type { AccessToken} from "@itwin/core-bentley";
+import { BeEvent } from "@itwin/core-bentley";
+import type { AuthorizationClient } from "@itwin/core-common";
 
 /** Implements the user permission abstraction by creating a dummy AccessToken. Note that the corresponding IModelBank server must
  * be able to tolerate this dummy token.

clients/imodelhub/src/imodelbank/IModelBankFileSystemITwinClient.ts

@@ -5,12 +5,14 @@
 /** @packageDocumentation
  * @module iModelBankClient
  */
-import { AccessToken, IModelHubStatus, Logger } from "@itwin/core-bentley";
-import { Project as ITwin } from "@itwin/projects-client";
-import { request, RequestOptions, Response } from "../itwin-client/Request";
-import { WsgInstance } from "../wsg/ECJsonTypeMap";
+import type { AccessToken} from "@itwin/core-bentley";
+import { IModelHubStatus, Logger } from "@itwin/core-bentley";
+import type { Project as ITwin } from "@itwin/projects-client";
+import type { RequestOptions, Response } from "../itwin-client/Request";
+import { request } from "../itwin-client/Request";
+import type { WsgInstance } from "../wsg/ECJsonTypeMap";
 import { WsgError, WSStatus } from "../wsg/WsgClient";
-import { ITwinManagerClient } from "../IModelCloudEnvironment";
+import type { ITwinManagerClient } from "../IModelCloudEnvironment";
 import { IModelHubClientError } from "../imodelhub/Errors";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
 

clients/imodelhub/src/imodelbank/IModelBankHandler.ts

@@ -5,7 +5,7 @@
 /** @packageDocumentation
  * @module iModelBankClient
  */
-import { FileHandler } from "../itwin-client/FileHandler";
+import type { FileHandler } from "../itwin-client/FileHandler";
 import { IModelBaseHandler } from "../imodelhub/BaseHandler";
 
 /**

clients/imodelhub/src/imodelhub/BaseHandler.ts

@@ -5,12 +5,14 @@
 /** @packageDocumentation
  * @module iModelHubClient
  */
-import { AccessToken } from "@itwin/core-bentley";
-import { RequestGlobalOptions, RequestOptions, RequestQueryOptions } from "../itwin-client/Request";
-import { FileHandler } from "../itwin-client/FileHandler";
-import { ChunkedQueryContext } from "../wsg/ChunkedQueryContext";
-import { WsgInstance } from "../wsg/ECJsonTypeMap";
-import { DefaultWsgRequestOptionsProvider, HttpRequestOptions, WsgClient, WsgRequestOptions } from "../wsg/WsgClient";
+import type { AccessToken } from "@itwin/core-bentley";
+import type { RequestOptions, RequestQueryOptions } from "../itwin-client/Request";
+import { RequestGlobalOptions } from "../itwin-client/Request";
+import type { FileHandler } from "../itwin-client/FileHandler";
+import type { ChunkedQueryContext } from "../wsg/ChunkedQueryContext";
+import type { WsgInstance } from "../wsg/ECJsonTypeMap";
+import type { HttpRequestOptions, WsgRequestOptions } from "../wsg/WsgClient";
+import { DefaultWsgRequestOptionsProvider, WsgClient } from "../wsg/WsgClient";
 import { CustomRequestOptions } from "./CustomRequestOptions";
 import { IModelHubError } from "./Errors";
 

clients/imodelhub/src/imodelhub/Briefcases.ts

@@ -6,14 +6,15 @@
  * @module iModelHubClient
  */
 
-import { AccessToken, GuidString, IModelHubStatus, Logger } from "@itwin/core-bentley";
-import { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
-import { ProgressCallback } from "../itwin-client/Request";
-import { IModelClient } from "../IModelClient";
+import type { AccessToken, GuidString} from "@itwin/core-bentley";
+import { IModelHubStatus, Logger } from "@itwin/core-bentley";
+import type { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
+import type { ProgressCallback } from "../itwin-client/Request";
+import type { IModelClient } from "../IModelClient";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { WsgQuery } from "../wsg/WsgQuery";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { ArgumentCheck, IModelHubClientError, IModelHubError } from "./Errors";
 import { addSelectApplicationData, addSelectFileAccessKey } from "./HubQuery";
 import { LockQuery } from "./Locks";

clients/imodelhub/src/imodelhub/ChangeSets.ts

@@ -6,13 +6,15 @@
  * @module iModelHubClient
  */
 
-import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
-import { DownloadFailed, FileHandler, SasUrlExpired } from "../itwin-client/FileHandler";
-import { ProgressCallback, ProgressInfo, RequestQueryOptions } from "../itwin-client/Request";
+import type { AccessToken, GuidString} from "@itwin/core-bentley";
+import { Logger } from "@itwin/core-bentley";
+import type { FileHandler} from "../itwin-client/FileHandler";
+import { DownloadFailed, SasUrlExpired } from "../itwin-client/FileHandler";
+import type { ProgressCallback, ProgressInfo, RequestQueryOptions } from "../itwin-client/Request";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { ChunkedQueryContext } from "../wsg/ChunkedQueryContext";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { ArgumentCheck, IModelHubClientError } from "./Errors";
 import { addSelectApplicationData, addSelectFileAccessKey, StringIdQuery } from "./HubQuery";
 

clients/imodelhub/src/imodelhub/Checkpoints.ts

@@ -6,16 +6,17 @@
  * @module iModelHubClient
  */
 
-import { AccessToken, GuidString, Logger, PerfLogger } from "@itwin/core-bentley";
-import { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
-import { ProgressCallback } from "../itwin-client/Request";
+import type { AccessToken, GuidString} from "@itwin/core-bentley";
+import { Logger, PerfLogger } from "@itwin/core-bentley";
+import type { CancelRequest, FileHandler } from "../itwin-client/FileHandler";
+import type { ProgressCallback } from "../itwin-client/Request";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { WsgQuery } from "../wsg/WsgQuery";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { ArgumentCheck, IModelHubClientError } from "./Errors";
 import { addSelectFileAccessKey } from "./HubQuery";
-import { InitializationState } from "./iModels";
+import type { InitializationState } from "./iModels";
 
 const loggerCategory: string = IModelHubClientLoggerCategory.IModelHub;
 

clients/imodelhub/src/imodelhub/CheckpointsV2.ts

@@ -6,11 +6,12 @@
  * @module iModelHubClient
  */
 
-import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
+import type { AccessToken, GuidString} from "@itwin/core-bentley";
+import { Logger } from "@itwin/core-bentley";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { WsgQuery } from "../wsg/WsgQuery";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { ArgumentCheck } from "./Errors";
 import { addSelectContainerAccessKey } from "./HubQuery";
 

clients/imodelhub/src/imodelhub/Client.ts

@@ -6,7 +6,7 @@
  * @module iModelHubClient
  */
 
-import { FileHandler } from "../itwin-client/FileHandler";
+import type { FileHandler } from "../itwin-client/FileHandler";
 import { IModelClient } from "../IModelClient";
 import { IModelBaseHandler } from "./BaseHandler";
 import { PermissionHandler } from "./Permissions";

clients/imodelhub/src/imodelhub/Codes.ts

@@ -7,13 +7,14 @@
  */
 
 import deepAssign from "deep-assign";
-import { AccessToken, GuidString, Id64String, IModelHubStatus, Logger } from "@itwin/core-bentley";
+import type { AccessToken, GuidString, Id64String} from "@itwin/core-bentley";
+import { IModelHubStatus, Logger } from "@itwin/core-bentley";
 import { ResponseError } from "../itwin-client/Request";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { WsgQuery } from "../wsg/WsgQuery";
-import { WsgRequestOptions } from "../wsg/WsgClient";
+import type { WsgRequestOptions } from "../wsg/WsgClient";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { AggregateResponseError, ArgumentCheck, IModelHubClientError, IModelHubError } from "./Errors";
 
 const loggerCategory: string = IModelHubClientLoggerCategory.IModelHub;

clients/imodelhub/src/imodelhub/Errors.ts

@@ -7,8 +7,9 @@
  */
 
 import deepAssign from "deep-assign";
-import { GetMetaDataFunction, Guid, HttpStatus, IModelHubStatus, LogFunction, Logger } from "@itwin/core-bentley";
-import { ResponseError } from "../itwin-client/Request";
+import type { GetMetaDataFunction, LogFunction} from "@itwin/core-bentley";
+import { Guid, HttpStatus, IModelHubStatus, Logger } from "@itwin/core-bentley";
+import type { ResponseError } from "../itwin-client/Request";
 import { WsgError, WSStatus } from "../wsg/WsgClient";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
 

clients/imodelhub/src/imodelhub/Events.ts

@@ -5,11 +5,13 @@
 /** @packageDocumentation
  * @module iModelHubClient
  */
-import { AccessToken, GuidString, Id64, Id64String, Logger } from "@itwin/core-bentley";
-import { request, Response } from "../itwin-client/Request";
+import type { AccessToken, GuidString, Id64String} from "@itwin/core-bentley";
+import { Id64, Logger } from "@itwin/core-bentley";
+import type { Response } from "../itwin-client/Request";
+import { request } from "../itwin-client/Request";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { CodeState } from "./Codes";
 import { ArgumentCheck } from "./Errors";
 import {

clients/imodelhub/src/imodelhub/EventsBase.ts

@@ -6,11 +6,13 @@
  * @module iModelHubClient
  */
 
-import { AccessToken, BeEvent } from "@itwin/core-bentley";
-import { request, RequestOptions } from "../itwin-client/Request";
+import type { AccessToken} from "@itwin/core-bentley";
+import { BeEvent } from "@itwin/core-bentley";
+import type { RequestOptions } from "../itwin-client/Request";
+import { request } from "../itwin-client/Request";
 import { DefaultRequestOptionsProvider } from "../request/Client";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 
 /**
  * Base class for event shared access signatures.

clients/imodelhub/src/imodelhub/GlobalEvents.ts

@@ -5,11 +5,13 @@
 /** @packageDocumentation
  * @module iModelHubClient
  */
-import { AccessToken, GuidString, Logger } from "@itwin/core-bentley";
-import { request, RequestOptions, Response } from "../itwin-client/Request";
+import type { AccessToken, GuidString} from "@itwin/core-bentley";
+import { Logger } from "@itwin/core-bentley";
+import type { RequestOptions, Response } from "../itwin-client/Request";
+import { request } from "../itwin-client/Request";
 import { ECJsonTypeMap, WsgInstance } from "../wsg/ECJsonTypeMap";
 import { IModelHubClientLoggerCategory } from "../IModelHubClientLoggerCategories";
-import { IModelBaseHandler } from "./BaseHandler";
+import type { IModelBaseHandler } from "./BaseHandler";
 import { ArgumentCheck } from "./Errors";
 import {
   BaseEventSAS, EventBaseHandler, EventListener, GetEventOperationToRequestType, IModelHubBaseEvent, ListenerSubscription,

clients/imodelhub/src/imodelhub/HubQuery.ts

@@ -6,8 +6,8 @@
  * @module iModelHubClient
  */
 
-import { GuidString } from "@itwin/core-bentley";
-import { RequestQueryOptions } from "../itwin-client/Request";
+import type { GuidString } from "@itwin/core-bentley";
+import type { RequestQueryOptions } from "../itwin-client/Request";
 import { WsgQuery } from "../wsg/WsgQuery";
 import { ArgumentCheck } from "./Errors";