refactor(cli): import zod directly instead of through incur (#11655)

* refactor(cli): import zod directly instead of through incur

* fix(verify): count incur z imports from declarations, not comment or string text
This commit is contained in:
morluto authored and GitHub committed 2026-11-16 10:37:43 +08:00
1 parent 832984c2cc
commit 07c5a54fee
54 files changed
+159 -50

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import { AdbDeviceAnalysisService } from "../application/adb/AdbDeviceAnalysisService.js";
+1 -1
View File
@@ -6,7 +6,7 @@ import {
undeliveredSourceClosure,
} from "../application/AnalysisEvidenceSources.js";
import type { AnalysisViewRequest } from "../domain/analysisView/analysisViewRequest.js";
import { z } from "incur";
import { z } from "zod";
import {
isImmutableEvidence,
parseEvidence,
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { inspectAnalysisView } from "../application/analysisView/AnalysisViewService.js";
import { ArtifactResourceScope } from "../resources/index.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import type { z } from "incur";
import type { z } from "zod";
import type { BrowserObservationPort } from "../ports/BrowserObservationPort.js";
import { createBrowserObservationProvider } from "../composition/browserObservation.js";
+2 -1
View File
@@ -1,4 +1,5 @@
import { Cli, z } from "incur";
import { Cli } from "incur";
import { z } from "zod";
import { HOST_PLATFORM } from "../platform/HostPlatform.js";
import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js";
+2 -1
View File
@@ -1,4 +1,5 @@
import { Cli, Completions, z } from "incur";
import { Cli, Completions } from "incur";
import { z } from "zod";
import {
CLI_COMPLETION_SHELLS,
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { invariantViolation } from "../domain/internalInvariant.js";
import type { Logger } from "pino";
+1 -1
View File
@@ -1,5 +1,5 @@
import { contractNamed } from "./contractCliDescription.js";
import { z } from "incur";
import { z } from "zod";
import { realpath, stat } from "node:fs/promises";
import { findAppBundleResourceRoot } from "../application/AppBundleExecutable.js";
+1 -1
View File
@@ -4,7 +4,7 @@ import { desktopViewPolicyInputSchema } from "../domain/desktop/desktopViewPolic
import { safeParseJson } from "../domain/safeJson.js";
import { createInterface } from "node:readline";
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import { captureDesktopApplication } from "../application/desktop/DesktopApplicationCapture.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
/**
* CLI argv keeps the domain field's inbound text. A service transform still
+2 -1
View File
@@ -1,6 +1,7 @@
import { projectCliAnalysisResult } from "./projectCliAnalysisResult.js";
import { Cli, z } from "incur";
import { Cli } from "incur";
import { z } from "zod";
import { ELECTRON_TOOL_CONTRACTS } from "../contracts/javascript/electronToolContracts.js";
import { contractNamed } from "./contractCliDescription.js";
+1 -1
View File
@@ -8,7 +8,7 @@ import type {
} from "../application/environment/environmentExport.js";
import type { EnvironmentSource } from "../application/environment/environmentSource.js";
import type { ServedState } from "../application/environment/environmentState.js";
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import {
+2 -1
View File
@@ -1,6 +1,7 @@
import { AsyncLocalStorage } from "node:async_hooks";
import { Errors, z, type MiddlewareHandler } from "incur";
import { Errors, type MiddlewareHandler } from "incur";
import { z } from "zod";
import {
parseCliOutputArguments,
+1 -1
View File
@@ -1,5 +1,5 @@
import { projectCliAnalysisResult } from "./projectCliAnalysisResult.js";
import { z } from "incur";
import { z } from "zod";
import { FridaInstrumentationService } from "../application/frida/FridaInstrumentationService.js";
import type { FridaInstrumentationPort } from "../ports/frida/FridaInstrumentationPort.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { ArtifactResourceScope } from "../resources/index.js";
import {
readGuidanceSection,
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import { createIl2cppMetadataService } from "../composition/il2cpp.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { ContractCommandContext } from "./contractCommand.js";
import type { AnalysisViewRequest } from "../domain/analysisView/analysisViewRequest.js";
import { publishCliAnalysisEvidence } from "./analysisEvidenceDelivery.js";
+1 -1
View File
@@ -1,5 +1,5 @@
import { projectCliAnalysisResult } from "./projectCliAnalysisResult.js";
import type { z } from "incur";
import type { z } from "zod";
import type { JavaScriptRuntimeObservationPort } from "../ports/javascript/JavaScriptRuntimeObservationPort.js";
import {
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { jsonDocumentText } from "../domain/schemaConstraints.js";
+2 -1
View File
@@ -1,7 +1,8 @@
import { HOST_PLATFORM } from "../platform/HostPlatform.js";
import { Writable } from "node:stream";
import { Help, z } from "incur";
import { Help } from "incur";
import { z } from "zod";
import {
mcpClientRegistrationWritten,
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import { matchNativeFunctionsFromBundles } from "../application/native/NativeFunctionMatchingService.js";
import { ArtifactResourceScope } from "../resources/index.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { CliInstance } from "./types.js";
import { visitRegisteredCommands } from "./visitRegisteredCommands.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { localPathStringSchema } from "../domain/localPath.js";
import {
+2 -1
View File
@@ -1,4 +1,5 @@
import { Cli, z } from "incur";
import { Cli } from "incur";
import { z } from "zod";
import {
captureProcessScenarioFile,
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import type { Logger } from "pino";
import { createReleaseExposureService } from "../composition/releaseExposure.js";
+1 -1
View File
@@ -1,4 +1,4 @@
import { z } from "incur";
import { z } from "zod";
import { localPathStringSchema } from "../domain/localPath.js";
import type { Logger } from "pino";
import { OBJDUMP_PROVIDER_IDENTITY } from "../objdump/ObjdumpProviderIdentity.js";
+1 -1
View File
@@ -1,6 +1,6 @@
import { HOST_PLATFORM } from "../platform/HostPlatform.js";
import { withCommandCancellation } from "./commandCancellation.js";
import { z } from "incur";
import { z } from "zod";
import type { DoctorScope } from "../application/Doctor.js";
import {
+2 -1
View File
@@ -1,6 +1,7 @@
import { AsyncLocalStorage } from "node:async_hooks";
import { Errors, Parser, z } from "incur";
import { Errors, Parser } from "incur";
import { z } from "zod";
import { splitIncurBuiltinArguments } from "../cliBuiltinArguments.js";
import type { CliInstance } from "./types.js";
+1 -1
View File
@@ -1,6 +1,6 @@
import { contractNamed } from "./contractCliDescription.js";
import { resolveJavaScriptMemberMutationAllowance } from "../config/javascriptMemberMutationAllowance.js";
import { z } from "incur";
import { z } from "zod";
import { cliDecimalField } from "./options.js";
import { requirePresence } from "../domain/schemaConstraints.js";