consistent type imports (#1175)

Author: mbostock

.eslintrc.json

@@ -27,6 +27,7 @@
     "@typescript-eslint/no-explicit-any": 0,
     "@typescript-eslint/no-this-alias": 0,
     "@typescript-eslint/no-unused-vars": ["error", {"ignoreRestSiblings": true}],
+    "import/consistent-type-specifier-style": "warn",
     "import/first": "warn",
     "import/newline-after-import": "warn",
     "import/no-duplicates": "off",

src/bin/observable.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import {type ParseArgsConfig, parseArgs} from "node:util";
+import type {ParseArgsConfig} from "node:util";
+import {parseArgs} from "node:util";
 import * as clack from "@clack/prompts";
 import {readConfig} from "../config.js";
 import {CliError} from "../error.js";

src/convert.ts

@@ -7,7 +7,8 @@ import type {ClackEffects} from "./clack.js";
 import {CliError} from "./error.js";
 import {prepareOutput} from "./files.js";
 import {getObservableUiOrigin} from "./observableApiClient.js";
-import {type TtyEffects, bold, cyan, faint, inverse, link, reset, defaultEffects as ttyEffects} from "./tty.js";
+import type {TtyEffects} from "./tty.js";
+import {bold, cyan, faint, inverse, link, reset, defaultEffects as ttyEffects} from "./tty.js";
 
 export interface ConvertEffects extends TtyEffects {
   clack: ClackEffects;

src/dataloader.ts

@@ -1,5 +1,6 @@
 import {createHash} from "node:crypto";
-import {type WriteStream, createReadStream, existsSync, statSync} from "node:fs";
+import type {WriteStream} from "node:fs";
+import {createReadStream, existsSync, statSync} from "node:fs";
 import {mkdir, open, readFile, rename, unlink} from "node:fs/promises";
 import {dirname, extname, join, relative} from "node:path/posix";
 import {createGunzip} from "node:zlib";

src/deploy.ts

@@ -11,28 +11,18 @@ import type {Config} from "./config.js";
 import {CliError, isApiError, isEnoent, isHttpError} from "./error.js";
 import {visitFiles} from "./files.js";
 import type {Logger} from "./logger.js";
-import {
-  type AuthEffects,
-  defaultEffects as defaultAuthEffects,
-  formatUser,
-  loginInner,
-  validWorkspaces
-} from "./observableApiAuth.js";
+import type {AuthEffects} from "./observableApiAuth.js";
+import {defaultEffects as defaultAuthEffects, formatUser, loginInner, validWorkspaces} from "./observableApiAuth.js";
 import {ObservableApiClient} from "./observableApiClient.js";
-import {
-  type GetCurrentUserResponse,
-  type GetDeployResponse,
-  type GetProjectResponse,
-  type PostEditProjectRequest,
-  type WorkspaceResponse
+import type {
+  GetCurrentUserResponse,
+  GetDeployResponse,
+  GetProjectResponse,
+  PostEditProjectRequest,
+  WorkspaceResponse
 } from "./observableApiClient.js";
-import {
-  type ConfigEffects,
-  type DeployConfig,
-  defaultEffects as defaultConfigEffects,
-  getDeployConfig,
-  setDeployConfig
-} from "./observableApiConfig.js";
+import type {ConfigEffects, DeployConfig} from "./observableApiConfig.js";
+import {defaultEffects as defaultConfigEffects, getDeployConfig, setDeployConfig} from "./observableApiConfig.js";
 import {slugify} from "./slugify.js";
 import {Telemetry} from "./telemetry.js";
 import type {TtyEffects} from "./tty.js";

src/javascript/awaits.ts

@@ -1,4 +1,4 @@
-import {type Node} from "acorn";
+import type {Node} from "acorn";
 import {recursive} from "acorn-walk";
 
 export function findAwaits(node: Node): Node[] {

src/javascript/syntaxError.ts

@@ -1,4 +1,5 @@
-import {type Node, getLineInfo} from "acorn";
+import type {Node} from "acorn";
+import {getLineInfo} from "acorn";
 
 export function syntaxError(message: string, node: Node, input: string): SyntaxError {
   const {line, column} = getLineInfo(input, node.start);

src/observableApiAuth.ts

@@ -5,9 +5,8 @@ import {commandInstruction, commandRequiresAuthenticationMessage} from "./comman
 import {CliError, isHttpError} from "./error.js";
 import type {GetCurrentUserResponse, PostAuthRequestPollResponse} from "./observableApiClient.js";
 import {ObservableApiClient, getObservableUiOrigin} from "./observableApiClient.js";
-import type {ConfigEffects} from "./observableApiConfig.js";
+import type {ApiKey, ConfigEffects} from "./observableApiConfig.js";
 import {
-  type ApiKey,
   defaultEffects as defaultConfigEffects,
   getObservableApiKey,
   setObservableApiKey

src/observableApiConfig.ts

@@ -24,6 +24,7 @@ export const defaultEffects: ConfigEffects = {
 };
 
 const userConfigName = ".observablehq";
+
 interface UserConfig {
   auth?: {
     id: string;

src/rollup.ts

@@ -1,6 +1,6 @@
 import {extname} from "node:path/posix";
 import {nodeResolve} from "@rollup/plugin-node-resolve";
-import {type CallExpression} from "acorn";
+import type {CallExpression} from "acorn";
 import {simple} from "acorn-walk";
 import {build} from "esbuild";
 import type {AstNode, OutputChunk, Plugin, ResolveIdResult} from "rollup";

test/create-test.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import {readFile} from "node:fs/promises";
-import {type CreateEffects, create} from "../src/create.js";
+import type {CreateEffects} from "../src/create.js";
+import {create} from "../src/create.js";
 import {fromOsPath} from "../src/files.js";
 import {TestClackEffects} from "./mocks/clack.js";
 

test/deploy-test.ts

@@ -2,7 +2,8 @@ import assert, {fail} from "node:assert";
 import {stat} from "node:fs/promises";
 import {Readable, Writable} from "node:stream";
 import {normalizeConfig, setCurrentDate} from "../src/config.js";
-import {type DeployEffects, type DeployOptions, deploy, promptDeployTarget} from "../src/deploy.js";
+import type {DeployEffects, DeployOptions} from "../src/deploy.js";
+import {deploy, promptDeployTarget} from "../src/deploy.js";
 import {CliError, isHttpError} from "../src/error.js";
 import {visitFiles} from "../src/files.js";
 import type {ObservableApiClientOptions} from "../src/observableApiClient.js";

test/mocks/observableApi.ts

@@ -1,17 +1,14 @@
 import type {MockAgent} from "undici";
-import {type Interceptable} from "undici";
+import type {Interceptable} from "undici";
 import PendingInterceptorsFormatter from "undici/lib/mock/pending-interceptors-formatter.js";
 import type {
   GetCurrentUserResponse,
+  GetProjectResponse,
+  PaginatedList,
   PostAuthRequestPollResponse,
   PostAuthRequestResponse
 } from "../../src/observableApiClient.js";
-import {
-  type GetProjectResponse,
-  type PaginatedList,
-  getObservableApiOrigin,
-  getObservableUiOrigin
-} from "../../src/observableApiClient.js";
+import {getObservableApiOrigin, getObservableUiOrigin} from "../../src/observableApiClient.js";
 import {getCurrentAgent, mockAgent} from "./undici.js";
 
 export const validApiKey = "MOCK-VALID-KEY";

test/mocks/undici.ts

@@ -1,4 +1,5 @@
-import {type Dispatcher, MockAgent, getGlobalDispatcher, setGlobalDispatcher} from "undici";
+import type {Dispatcher} from "undici";
+import {MockAgent, getGlobalDispatcher, setGlobalDispatcher} from "undici";
 
 let currentAgent: MockAgent | null = null;