Use import type for type-only imports

oxlint's consistent-type-imports autofix has matured since the disable
was written; it correctly identifies the type-only import names and
emits separate `import type` declarations. Followed up the autofix with
a small merge pass to combine the new `import type { X }` and the
remaining `import { Y }` from the same module into a single
`import { type X, Y }` statement, which keeps the import block tidy
and resolves the no-duplicate-imports complaint.

Inline `import("module").Type` annotations were left alone: hoisting
them would either create circular imports or expand the import block
for a one-off reference. The rule is configured with
`disallowTypeAnnotations: false` so it keeps the top-level form
enforced while permitting the inline form.

Drops the `typescript/consistent-type-imports` disable. Tests stayed
green (server 2634, format 186, binary unit 557, client all).

Author: burner1024

.oxlintrc.json

@@ -120,10 +120,12 @@
         // impls are sync).
         "require-await": "off",
 
-        // Autofix rewrites `import { X }` to `import type { X }` based on
-        // type-position usage, but misses runtime usages (class
-        // constructors, static members) and breaks the build.
-        "typescript/consistent-type-imports": "off",
+        // Inline `import("module").Type` annotations are used in places where
+        // hoisting to a top-level import would create a circular import or
+        // expand the import block for a one-off type reference. Keep the
+        // top-level `import { X }` -> `import type { X }` enforcement active
+        // (controlled by `prefer: "type-imports"`) but allow the inline form.
+        "typescript/consistent-type-imports": ["error", { "disallowTypeAnnotations": false }],
 
         // `T[]` and `Array<T>` are both idiomatic; forcing one is churn.
         "typescript/array-type": "off",

binary/src/ie-common/canonical-reader.ts

@@ -19,7 +19,7 @@
  * one format could grow a snapshot field the others didn't get.
  */
 
-import { z } from "zod";
+import type { z } from "zod";
 import { parseWithSchemaValidation } from "../schema-validation";
 import type { ParseResult } from "../types";
 

binary/src/ie-common/json-snapshot.ts

@@ -18,7 +18,7 @@
  * silently get an out-of-sync result.
  */
 
-import { z } from "zod";
+import type { z } from "zod";
 import { parseWithSchemaValidation } from "../schema-validation";
 import type { BinaryParser, ParseOptions, ParseResult } from "../types";
 

binary/src/map/canonical-reader.ts

@@ -3,7 +3,7 @@
  * from a parsed display tree (ParseResult).
  */
 
-import { z } from "zod";
+import type { z } from "zod";
 import { clampNumericValue } from "../binary-format-contract";
 import { parseWithSchemaValidation } from "../schema-validation";
 import { walkGroup } from "../spec/walk-display";
@@ -31,17 +31,16 @@ import {
     timerSlotPresentation,
 } from "./specs/script-slot";
 import {
+    type mapTileElevationSchema,
+    type mapScriptSlotSchema,
+    type mapScriptSectionSchema,
+    type mapObjectSchema,
+    type mapObjectsSchema,
     mapCanonicalDocumentSchema,
     mapCanonicalSnapshotSchema,
-    mapTileElevationSchema,
-    mapScriptSlotSchema,
-    mapScriptSectionSchema,
-    mapObjectSchema,
-    mapObjectsSchema,
     type MapCanonicalDocument,
     type MapCanonicalSnapshot,
 } from "./canonical-schemas";
-
 function isGroup(entry: ParsedField | ParsedGroup): entry is ParsedGroup {
     return "fields" in entry;
 }

binary/src/map/canonical-writer.ts

@@ -2,7 +2,7 @@
  * Writer helpers for serializing MapCanonicalDocument back to binary MAP format bytes.
  */
 
-import { z } from "zod";
+import type { z } from "zod";
 import { BufferWriter } from "typed-binary";
 import { decodeOpaqueRange } from "../opaque-range";
 import { toTypedBinarySchema } from "../spec/derive-typed-binary";
@@ -22,19 +22,18 @@ import { objectBaseSpec, inventoryHeaderSpec, critterDataSpec, exitGridSpec } fr
 import { hasElevation } from "./types";
 import type { ParseOpaqueRange } from "../types";
 import {
-    mapHeaderSchema,
-    mapTileElevationSchema,
-    mapScriptSectionSchema,
-    mapScriptSlotSchema,
-    mapObjectSchema,
-    mapObjectsSchema,
+    type mapHeaderSchema,
+    type mapTileElevationSchema,
+    type mapScriptSectionSchema,
+    type mapScriptSlotSchema,
+    type mapObjectSchema,
+    type mapObjectsSchema,
     MAP_OBJECT_BASE_SIZE,
     MAP_OBJECT_DATA_HEADER_SIZE,
     PID_TYPE_CRITTER,
     PID_TYPE_MISC,
     type MapCanonicalDocument,
 } from "./canonical-schemas";
-
 const headerCodec = toTypedBinarySchema(mapHeaderSpec);
 const varSectionCodec = toTypedBinarySchema<typeof varSectionSpec, VarSectionCtx>(varSectionSpec);
 const otherSlotCodec = toTypedBinarySchema(otherSlotSpec);

binary/src/schema-validation.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import type { z } from "zod";
 
 type PathSegment = PropertyKey;
 

binary/src/spec/codec-meta.ts

@@ -1,4 +1,5 @@
 import {
+    type MaxValue,
     u8,
     u16,
     u32,
@@ -7,13 +8,11 @@ import {
     i32,
     Schema,
     Measurer,
-    MaxValue,
     type ISchema,
     type ISerialInput,
     type ISerialOutput,
     type IMeasurer,
 } from "typed-binary";
-
 type NumericTypeName = "uint8" | "uint16" | "uint24" | "uint32" | "int8" | "int16" | "int24" | "int32";
 
 /**

client/src/dialog-tree/dialogTree-d.ts

@@ -4,8 +4,8 @@
  * then parsed). Uses shared panel infrastructure from ./shared.ts.
  */
 
-import * as vscode from "vscode";
-import { LanguageClient } from "vscode-languageclient/node";
+import type * as vscode from "vscode";
+import type { LanguageClient } from "vscode-languageclient/node";
 import { escapeHtml, registerDialogPanel, type DialogPreviewController } from "./shared";
 import type {
     DDialogData,

client/src/dialog-tree/dialogTree.ts

@@ -3,8 +3,8 @@
  * Uses shared panel infrastructure from ./shared.ts.
  */
 
-import * as vscode from "vscode";
-import { LanguageClient } from "vscode-languageclient/node";
+import type * as vscode from "vscode";
+import type { LanguageClient } from "vscode-languageclient/node";
 import type { SSLDialogData, SSLDialogNode, SSLDialogOption } from "../../../shared/dialog-types";
 import { escapeHtml, registerDialogPanel, type DialogPreviewController } from "./shared";
 

client/src/dialog-tree/shared.ts

@@ -9,7 +9,7 @@
 import * as vscode from "vscode";
 import * as path from "path";
 import { randomBytes } from "crypto";
-import { type ExecuteCommandParams, LanguageClient, ExecuteCommandRequest } from "vscode-languageclient/node";
+import { type LanguageClient, type ExecuteCommandParams, ExecuteCommandRequest } from "vscode-languageclient/node";
 import { conlog } from "../logging";
 import { escapeHtml } from "../utils";
 import { getCachedCssAsset, getCachedHtmlAsset, getCachedJsAsset } from "../webview-assets";