From 6b1e790a16959d9e0a7d4675d83f518de2cc978d Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Mon, 6 Jul 2020 15:39:04 +0100 Subject: [PATCH] Use import type for declaration imports Change-type: patch --- lib/index.d.ts | 4 ++-- lib/models/billing.ts | 2 +- lib/models/os.ts | 2 +- lib/util/callbacks.ts | 2 +- .../device-actions/device-actions-service.ts | 2 +- lib/util/device-actions/os-update/index.ts | 2 +- lib/util/device-types.ts | 2 +- lib/util/index.ts | 2 +- tests/integration/models/organization.spec.ts | 2 +- tests/typings/chai-samsam.d.ts | 1 - tests/util_ts.ts | 2 +- typing_tests/pine-options-with-select.ts | 2 -- typing_tests/pine-options.ts | 4 ++-- typings/balena-pine.d.ts | 4 ++-- typings/balena-request.d.ts | 6 ++--- typings/balena-sdk/device-state.d.ts | 3 +-- typings/balena-sdk/device-type-json.d.ts | 3 +-- typings/balena-sdk/index.d.ts | 22 +++++++++---------- typings/balena-sdk/models.d.ts | 11 ++-------- typings/pinejs-client-core.d.ts | 2 +- 20 files changed, 34 insertions(+), 46 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 19d0001ef..204c92cdb 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,7 +1,7 @@ import BalenaAuth from 'balena-auth/lib/auth'; -import * as BalenaPine from '../typings/balena-pine'; -import * as BalenaRequest from '../typings/balena-request'; +import type * as BalenaPine from '../typings/balena-pine'; +import type * as BalenaRequest from '../typings/balena-request'; import type * as BalenaSdk from '..'; import { PubSub } from './util/pubsub'; diff --git a/lib/models/billing.ts b/lib/models/billing.ts index 0188d57e4..ca1d26e0b 100644 --- a/lib/models/billing.ts +++ b/lib/models/billing.ts @@ -15,7 +15,7 @@ limitations under the License. */ import * as Bluebird from 'bluebird'; -import { BalenaRequestStreamResult } from '../../typings/balena-request'; +import type { BalenaRequestStreamResult } from '../../typings/balena-request'; import type { BillingAccountInfo, BillingInfo, diff --git a/lib/models/os.ts b/lib/models/os.ts index 85dad4216..8840443dd 100644 --- a/lib/models/os.ts +++ b/lib/models/os.ts @@ -25,7 +25,7 @@ import { isNotFoundResponse, onlyIf, treatAsMissingApplication } from '../util'; import type * as deviceTypesUtilsType from '../util/device-types'; import type { hupActionHelper as hupActionHelperType } from '../util/device-actions/os-update/utils'; -import { BalenaRequestStreamResult } from '../../typings/balena-request'; +import type { BalenaRequestStreamResult } from '../../typings/balena-request'; import type { DeviceTypeJson, ImgConfigOptions, diff --git a/lib/util/callbacks.ts b/lib/util/callbacks.ts index 2478ac04e..4cd097bfe 100644 --- a/lib/util/callbacks.ts +++ b/lib/util/callbacks.ts @@ -1,5 +1,5 @@ import * as Bluebird from 'bluebird'; -import { Dictionary } from '../../typings/utils'; +import type { Dictionary } from '../../typings/utils'; // Use with: `findCallback(arguments)`. const findCallback = (args: IArguments): ((...args: any[]) => any) | void => { diff --git a/lib/util/device-actions/device-actions-service.ts b/lib/util/device-actions/device-actions-service.ts index bd66d41d9..0763520b8 100644 --- a/lib/util/device-actions/device-actions-service.ts +++ b/lib/util/device-actions/device-actions-service.ts @@ -1,5 +1,5 @@ import * as Bluebird from 'bluebird'; -import * as BalenaRequest from '../../../typings/balena-request'; +import type * as BalenaRequest from '../../../typings/balena-request'; interface MakeActionRequestParams { uuid: string; diff --git a/lib/util/device-actions/os-update/index.ts b/lib/util/device-actions/os-update/index.ts index abc70a0eb..a7d0c4653 100644 --- a/lib/util/device-actions/os-update/index.ts +++ b/lib/util/device-actions/os-update/index.ts @@ -1,4 +1,4 @@ -import * as BalenaRequest from '../../../../typings/balena-request'; +import type * as BalenaRequest from '../../../../typings/balena-request'; import type * as BalenaSdk from '../../../..'; import { DeviceActionsService } from '../device-actions-service'; diff --git a/lib/util/device-types.ts b/lib/util/device-types.ts index fd0c4b733..cef00a9a3 100644 --- a/lib/util/device-types.ts +++ b/lib/util/device-types.ts @@ -1,6 +1,6 @@ import * as errors from 'balena-errors'; import type { DeviceTypeJson } from '../..'; -import { Dictionary } from '../../typings/utils'; +import type { Dictionary } from '../../typings/utils'; type DeviceType = DeviceTypeJson.DeviceType; diff --git a/lib/util/index.ts b/lib/util/index.ts index 2d3f4192b..a4cdccc17 100644 --- a/lib/util/index.ts +++ b/lib/util/index.ts @@ -1,5 +1,5 @@ import * as errors from 'balena-errors'; -import * as Pine from '../../typings/pinejs-client-core'; +import type * as Pine from '../../typings/pinejs-client-core'; export const notImplemented = () => { throw new Error('The method is not implemented.'); diff --git a/tests/integration/models/organization.spec.ts b/tests/integration/models/organization.spec.ts index 3ee3bb7e2..352105529 100644 --- a/tests/integration/models/organization.spec.ts +++ b/tests/integration/models/organization.spec.ts @@ -2,7 +2,7 @@ import * as Bluebird from 'bluebird'; // tslint:disable-next-line:import-blacklist import * as _ from 'lodash'; import * as m from 'mochainon'; -import { AnyObject } from '../../../typings/utils'; +import type { AnyObject } from '../../../typings/utils'; import { balena, credentials, givenLoggedInUser } from '../setup'; const { expect } = m.chai; diff --git a/tests/typings/chai-samsam.d.ts b/tests/typings/chai-samsam.d.ts index fd0722c4c..18c9d6974 100644 --- a/tests/typings/chai-samsam.d.ts +++ b/tests/typings/chai-samsam.d.ts @@ -1,6 +1,5 @@ /// -// tslint:disable-next-line:no-module declare module 'chai-samsam' { const chaiSamSam: Chai.ChaiPlugin; export = chaiSamSam; diff --git a/tests/util_ts.ts b/tests/util_ts.ts index 02877716f..708a1883d 100644 --- a/tests/util_ts.ts +++ b/tests/util_ts.ts @@ -1,5 +1,5 @@ import * as m from 'mochainon'; -import { AnyObject } from '../typings/utils'; +import type { AnyObject } from '../typings/utils'; import { balena, BalenaSdk } from './integration/setup'; const { expect } = m.chai; diff --git a/typing_tests/pine-options-with-select.ts b/typing_tests/pine-options-with-select.ts index 2ecd4e8ad..a3549339d 100644 --- a/typing_tests/pine-options-with-select.ts +++ b/typing_tests/pine-options-with-select.ts @@ -1,7 +1,5 @@ /// import type * as BalenaSdk from '..'; -import { InferAssociatedResourceType } from '../typings/pinejs-client-core'; -import { AnyObject } from '../typings/utils'; // This file is in .prettierignore, since otherwise // the @ts-expect-error comments would move to the wrong place diff --git a/typing_tests/pine-options.ts b/typing_tests/pine-options.ts index 33377e968..ddeb96760 100644 --- a/typing_tests/pine-options.ts +++ b/typing_tests/pine-options.ts @@ -1,7 +1,7 @@ /// import type * as BalenaSdk from '..'; -import { InferAssociatedResourceType } from '../typings/pinejs-client-core'; -import { AnyObject } from '../typings/utils'; +import type { InferAssociatedResourceType } from '../typings/pinejs-client-core'; +import type { AnyObject } from '../typings/utils'; import { Equals, EqualsTrue } from './utils'; // This file is in .prettierignore, since otherwise diff --git a/typings/balena-pine.d.ts b/typings/balena-pine.d.ts index bc0901e03..4aa0e0b63 100644 --- a/typings/balena-pine.d.ts +++ b/typings/balena-pine.d.ts @@ -1,5 +1,5 @@ -import * as Bluebird from 'bluebird'; -import * as PineClient from './pinejs-client-core'; +import type * as Bluebird from 'bluebird'; +import type * as PineClient from './pinejs-client-core'; export interface Pine { delete( diff --git a/typings/balena-request.d.ts b/typings/balena-request.d.ts index 89e7ffd10..07de7765e 100644 --- a/typings/balena-request.d.ts +++ b/typings/balena-request.d.ts @@ -1,6 +1,6 @@ -import * as Bluebird from 'bluebird'; -import { Readable } from 'stream'; -import { Omit } from './utils'; +import type * as Bluebird from 'bluebird'; +import type { Readable } from 'stream'; +import type { Omit } from './utils'; /* tslint:disable:no-namespace */ declare namespace BalenaRequest { diff --git a/typings/balena-sdk/device-state.d.ts b/typings/balena-sdk/device-state.d.ts index 122997507..07174639f 100644 --- a/typings/balena-sdk/device-state.d.ts +++ b/typings/balena-sdk/device-state.d.ts @@ -1,6 +1,5 @@ -import { Dictionary } from '../utils'; +import type { Dictionary } from '../utils'; -// tslint:disable-next-line:no-module declare module './index' { export namespace DeviceState { export interface ServiceInfo { diff --git a/typings/balena-sdk/device-type-json.d.ts b/typings/balena-sdk/device-type-json.d.ts index 5255f1b11..651ec7046 100644 --- a/typings/balena-sdk/device-type-json.d.ts +++ b/typings/balena-sdk/device-type-json.d.ts @@ -1,6 +1,5 @@ -import { Dictionary } from '../utils'; +import type { Dictionary } from '../utils'; -// tslint:disable-next-line:no-module declare module './index' { /* types for the /device-types/v1 endppoints */ export namespace DeviceTypeJson { diff --git a/typings/balena-sdk/index.d.ts b/typings/balena-sdk/index.d.ts index 794d6570e..df21d394e 100644 --- a/typings/balena-sdk/index.d.ts +++ b/typings/balena-sdk/index.d.ts @@ -1,14 +1,14 @@ -import * as BalenaErrors from 'balena-errors'; -import * as Bluebird from 'bluebird'; -import { EventEmitter } from 'events'; - -import { Readable } from 'stream'; - -import * as BalenaPine from '../balena-pine'; -import { BalenaRequest, BalenaRequestStreamResult } from '../balena-request'; -import * as DeviceOverallStatus from './device-overall-status'; -import * as Pine from '../pinejs-client-core'; -import { Dictionary } from '../utils'; +import type * as BalenaErrors from 'balena-errors'; +import type * as Bluebird from 'bluebird'; +import type { EventEmitter } from 'events'; + +import type * as BalenaPine from '../balena-pine'; +import type { + BalenaRequest, + BalenaRequestStreamResult, +} from '../balena-request'; +import type * as DeviceOverallStatus from './device-overall-status'; +import type * as Pine from '../pinejs-client-core'; import './device-state'; import './device-type-json'; import './models'; diff --git a/typings/balena-sdk/models.d.ts b/typings/balena-sdk/models.d.ts index 8fed4166f..82a299711 100644 --- a/typings/balena-sdk/models.d.ts +++ b/typings/balena-sdk/models.d.ts @@ -1,12 +1,5 @@ -import { - PineDeferred, - OptionalNavigationResource, - ReverseNavigationResource, - NavigationResource, -} from '../pinejs-client-core'; -import * as DeviceOverallStatus from './device-overall-status'; - -// tslint:disable-next-line:no-module +import type * as DeviceOverallStatus from './device-overall-status'; + declare module './index' { export interface Organization { id: number; diff --git a/typings/pinejs-client-core.d.ts b/typings/pinejs-client-core.d.ts index 8a94c4f56..d3958e5ae 100644 --- a/typings/pinejs-client-core.d.ts +++ b/typings/pinejs-client-core.d.ts @@ -1,4 +1,4 @@ -import { AnyObject, Omit, PropsOfType, StringKeyof } from './utils'; +import type { AnyObject, Omit, PropsOfType, StringKeyof } from './utils'; export interface WithId { id: number;