From 07c5a54feee8de5ed5079fdebbdd122fa70d108a Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 10:37:43 +0800 Subject: [PATCH] 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 --- scripts/verify/architecture-guards.mjs | 13 ++++++ scripts/verify/incur-import-guard.d.mts | 1 + scripts/verify/incur-import-guard.mjs | 40 +++++++++++++++++++ src/cli/adbCommands.ts | 2 +- src/cli/analysisEvidenceDelivery.ts | 2 +- src/cli/analysisViewCommands.ts | 2 +- src/cli/browserContractCommands.ts | 2 +- src/cli/cliShell.ts | 3 +- src/cli/completions.ts | 3 +- src/cli/contractCommand.ts | 2 +- src/cli/coreBinaryCommands.ts | 2 +- src/cli/desktopCaptureCommands.ts | 2 +- src/cli/domainInput.ts | 2 +- src/cli/electronCommands.ts | 3 +- src/cli/environmentCommands.ts | 2 +- src/cli/explicitSensitiveArguments.ts | 3 +- src/cli/fridaCommands.ts | 2 +- src/cli/guidanceCommands.ts | 2 +- src/cli/il2cppCommands.ts | 2 +- src/cli/javascriptApplicationAnalysis.ts | 2 +- src/cli/javascriptRuntimeCommands.ts | 2 +- src/cli/jsonInputArgument.ts | 2 +- src/cli/mcpRegistration.ts | 3 +- src/cli/nativeFunctionMatchingCommands.ts | 2 +- src/cli/omittableDefaults.ts | 2 +- src/cli/options.ts | 2 +- src/cli/processCommands.ts | 3 +- src/cli/releaseExposureCommands.ts | 2 +- src/cli/reverseEngineeringCommands.ts | 2 +- src/cli/setupCommands.ts | 2 +- src/cli/strictPositionals.ts | 3 +- src/cli/utilityCommands.ts | 2 +- src/cliEvidenceCommands.ts | 3 +- src/main/mcpHttpArguments.ts | 3 +- src/mcpDoctorOptions.ts | 2 +- .../acceptance/darwinAvailabilityMcp.test.ts | 2 +- .../cli/cliContractCommandParity.test.ts | 3 +- .../boundary/cli/cliDecimalArguments.test.ts | 3 +- .../boundary/cli/cliDomainFieldSchema.test.ts | 3 +- .../cli/cliInputSchemaRequired.test.ts | 3 +- tests/boundary/cli/cliTimingArguments.test.ts | 3 +- .../cli/commandEvidenceDelivery.test.ts | 3 +- tests/boundary/cli/completions.test.ts | 3 +- .../cli/contractCommandInputFields.test.ts | 3 +- .../cli/contractCommandViewDelivery.test.ts | 3 +- .../cli/defaultAmpRegistration.test.ts | 3 +- .../cli/filteredFailureOutput.test.ts | 3 +- tests/boundary/cli/jsonLinesOutput.test.ts | 3 +- .../cli/markdownArgumentErrors.test.ts | 3 +- .../cli/overnightBatch1CliSchemas.test.ts | 3 +- .../cli/reverseEngineeringCommands.test.ts | 3 +- tests/boundary/cli/routedCommand.test.ts | 3 +- tests/boundary/cli/strictPositionals.test.ts | 3 +- tests/evaluation/incurImportGuard.test.ts | 29 ++++++++++++++ 54 files changed, 159 insertions(+), 50 deletions(-) create mode 100644 scripts/verify/incur-import-guard.d.mts create mode 100644 scripts/verify/incur-import-guard.mjs create mode 100644 tests/evaluation/incurImportGuard.test.ts diff --git a/scripts/verify/architecture-guards.mjs b/scripts/verify/architecture-guards.mjs index e2491df722..9aac2630dd 100644 --- a/scripts/verify/architecture-guards.mjs +++ b/scripts/verify/architecture-guards.mjs @@ -9,6 +9,7 @@ import { } from "./counted-baseline.mjs"; import { localCompletenessEnumCount } from "./completeness-enum-guard.mjs"; import { countKeyedFirstMatches } from "./keyed-first-match.mjs"; +import { incurZodImportCount } from "./incur-import-guard.mjs"; import { budgetArithmeticCount } from "./budget-arithmetic-guard.mjs"; import { localLimitErrorClassCount } from "./limit-class-guard.mjs"; import { @@ -907,6 +908,18 @@ checkCounted( [], ); +// Schemas import zod directly. incur's `z` is a re-export of the same package; +// importing it through the CLI framework ties schemas to a dependency REA is +// removing (#11654). Declarations are read from code tokens, so the text in a +// comment or string fixture does not count. +checkCounted( + 'zod imported through incur (import { z } from "zod")', + "incur-zod-reexport", + [...files, ...testFiles], + (_content, file) => incurZodImportCount(file.source ?? file.content), + [], +); + // `find` on a parsed section, program-header or load-command table silently // keeps the first of repeated declarations. Select keyed entries through // src/domain/keyedCollection (`uniqueKeyed`, `allKeyed`, or diff --git a/scripts/verify/incur-import-guard.d.mts b/scripts/verify/incur-import-guard.d.mts new file mode 100644 index 0000000000..47e912e1a0 --- /dev/null +++ b/scripts/verify/incur-import-guard.d.mts @@ -0,0 +1 @@ +export function incurZodImportCount(source: string): number; diff --git a/scripts/verify/incur-import-guard.mjs b/scripts/verify/incur-import-guard.mjs new file mode 100644 index 0000000000..0f1adae1b5 --- /dev/null +++ b/scripts/verify/incur-import-guard.mjs @@ -0,0 +1,40 @@ +// Counts import and re-export declarations that take zod's `z` from incur +// (`import { z } from "incur"`, `import type { z as Zod } from 'incur'`, +// `export { z } from "incur"`). Declarations are read from code tokens, so the +// same text in a comment, string or template is not counted. +import { tokenize } from "./source-tokens.mjs"; + +const isIncurSpecifier = (source, token) => + token?.kind === "string" && + (source.startsWith('"incur"', token.start) || + source.startsWith("'incur'", token.start)); + +/** @param {string} source */ +export const incurZodImportCount = (source) => { + const { tokens } = tokenize(source); + let count = 0; + for (let index = 0; index < tokens.length; index += 1) { + const keyword = tokens[index]; + if ( + keyword.kind !== "id" || + (keyword.text !== "import" && keyword.text !== "export") + ) + continue; + let at = index + 1; + if (tokens[at]?.kind === "id" && tokens[at].text === "type") at += 1; + if (tokens[at]?.text !== "{") continue; + let importsZ = false; + for (at += 1; at < tokens.length && tokens[at].text !== "}"; at += 1) + // In `{ z as zod }` the imported name is z; in `{ zod as z }` it is not. + if (tokens[at].text === "z" && tokens[at - 1]?.text !== "as") + importsZ = true; + if ( + importsZ && + tokens[at + 1]?.text === "from" && + isIncurSpecifier(source, tokens[at + 2]) + ) + count += 1; + index = at; + } + return count; +}; diff --git a/src/cli/adbCommands.ts b/src/cli/adbCommands.ts index 8ac389ca36..83769de97b 100644 --- a/src/cli/adbCommands.ts +++ b/src/cli/adbCommands.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import type { Logger } from "pino"; import { AdbDeviceAnalysisService } from "../application/adb/AdbDeviceAnalysisService.js"; diff --git a/src/cli/analysisEvidenceDelivery.ts b/src/cli/analysisEvidenceDelivery.ts index abe1b8e486..ba220589ed 100644 --- a/src/cli/analysisEvidenceDelivery.ts +++ b/src/cli/analysisEvidenceDelivery.ts @@ -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, diff --git a/src/cli/analysisViewCommands.ts b/src/cli/analysisViewCommands.ts index e11b9c3d4e..46ae5d0805 100644 --- a/src/cli/analysisViewCommands.ts +++ b/src/cli/analysisViewCommands.ts @@ -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"; diff --git a/src/cli/browserContractCommands.ts b/src/cli/browserContractCommands.ts index 5a2552a7b8..aade0f2256 100644 --- a/src/cli/browserContractCommands.ts +++ b/src/cli/browserContractCommands.ts @@ -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"; diff --git a/src/cli/cliShell.ts b/src/cli/cliShell.ts index c578435800..f72ff89093 100644 --- a/src/cli/cliShell.ts +++ b/src/cli/cliShell.ts @@ -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"; diff --git a/src/cli/completions.ts b/src/cli/completions.ts index 52e6f0cba5..b29e5d15be 100644 --- a/src/cli/completions.ts +++ b/src/cli/completions.ts @@ -1,4 +1,5 @@ -import { Cli, Completions, z } from "incur"; +import { Cli, Completions } from "incur"; +import { z } from "zod"; import { CLI_COMPLETION_SHELLS, diff --git a/src/cli/contractCommand.ts b/src/cli/contractCommand.ts index cb2dfe67ab..d1e7e01fec 100644 --- a/src/cli/contractCommand.ts +++ b/src/cli/contractCommand.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import { invariantViolation } from "../domain/internalInvariant.js"; import type { Logger } from "pino"; diff --git a/src/cli/coreBinaryCommands.ts b/src/cli/coreBinaryCommands.ts index 663667550a..feca796454 100644 --- a/src/cli/coreBinaryCommands.ts +++ b/src/cli/coreBinaryCommands.ts @@ -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"; diff --git a/src/cli/desktopCaptureCommands.ts b/src/cli/desktopCaptureCommands.ts index 992d0f7f57..28eef677c7 100644 --- a/src/cli/desktopCaptureCommands.ts +++ b/src/cli/desktopCaptureCommands.ts @@ -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"; diff --git a/src/cli/domainInput.ts b/src/cli/domainInput.ts index 9776383841..c85875b209 100644 --- a/src/cli/domainInput.ts +++ b/src/cli/domainInput.ts @@ -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 diff --git a/src/cli/electronCommands.ts b/src/cli/electronCommands.ts index ee62268e1d..96576c7906 100644 --- a/src/cli/electronCommands.ts +++ b/src/cli/electronCommands.ts @@ -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"; diff --git a/src/cli/environmentCommands.ts b/src/cli/environmentCommands.ts index 8c83a35cf0..8d9a671e9e 100644 --- a/src/cli/environmentCommands.ts +++ b/src/cli/environmentCommands.ts @@ -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 { diff --git a/src/cli/explicitSensitiveArguments.ts b/src/cli/explicitSensitiveArguments.ts index 5308a544e6..502a6a478d 100644 --- a/src/cli/explicitSensitiveArguments.ts +++ b/src/cli/explicitSensitiveArguments.ts @@ -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, diff --git a/src/cli/fridaCommands.ts b/src/cli/fridaCommands.ts index fcf0ea3152..2b8ff5ac9a 100644 --- a/src/cli/fridaCommands.ts +++ b/src/cli/fridaCommands.ts @@ -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"; diff --git a/src/cli/guidanceCommands.ts b/src/cli/guidanceCommands.ts index 1497556b1e..8903e62ce1 100644 --- a/src/cli/guidanceCommands.ts +++ b/src/cli/guidanceCommands.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import { ArtifactResourceScope } from "../resources/index.js"; import { readGuidanceSection, diff --git a/src/cli/il2cppCommands.ts b/src/cli/il2cppCommands.ts index 79b79f386d..8664092d38 100644 --- a/src/cli/il2cppCommands.ts +++ b/src/cli/il2cppCommands.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import type { Logger } from "pino"; import { createIl2cppMetadataService } from "../composition/il2cpp.js"; diff --git a/src/cli/javascriptApplicationAnalysis.ts b/src/cli/javascriptApplicationAnalysis.ts index db4a3947b1..ff457ca9e9 100644 --- a/src/cli/javascriptApplicationAnalysis.ts +++ b/src/cli/javascriptApplicationAnalysis.ts @@ -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"; diff --git a/src/cli/javascriptRuntimeCommands.ts b/src/cli/javascriptRuntimeCommands.ts index 830bdf5b71..ba8397be00 100644 --- a/src/cli/javascriptRuntimeCommands.ts +++ b/src/cli/javascriptRuntimeCommands.ts @@ -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 { diff --git a/src/cli/jsonInputArgument.ts b/src/cli/jsonInputArgument.ts index bef5abc197..3d829e2ef2 100644 --- a/src/cli/jsonInputArgument.ts +++ b/src/cli/jsonInputArgument.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import { jsonDocumentText } from "../domain/schemaConstraints.js"; diff --git a/src/cli/mcpRegistration.ts b/src/cli/mcpRegistration.ts index 6d7b4af90b..e07c5683a9 100644 --- a/src/cli/mcpRegistration.ts +++ b/src/cli/mcpRegistration.ts @@ -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, diff --git a/src/cli/nativeFunctionMatchingCommands.ts b/src/cli/nativeFunctionMatchingCommands.ts index a6caa65a65..533a105508 100644 --- a/src/cli/nativeFunctionMatchingCommands.ts +++ b/src/cli/nativeFunctionMatchingCommands.ts @@ -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"; diff --git a/src/cli/omittableDefaults.ts b/src/cli/omittableDefaults.ts index 1f9f3038c8..54897b5ce5 100644 --- a/src/cli/omittableDefaults.ts +++ b/src/cli/omittableDefaults.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import type { CliInstance } from "./types.js"; import { visitRegisteredCommands } from "./visitRegisteredCommands.js"; diff --git a/src/cli/options.ts b/src/cli/options.ts index 7a6b7526df..3f9844ac80 100644 --- a/src/cli/options.ts +++ b/src/cli/options.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import { localPathStringSchema } from "../domain/localPath.js"; import { diff --git a/src/cli/processCommands.ts b/src/cli/processCommands.ts index 09b50eb9c8..d66b961394 100644 --- a/src/cli/processCommands.ts +++ b/src/cli/processCommands.ts @@ -1,4 +1,5 @@ -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { captureProcessScenarioFile, diff --git a/src/cli/releaseExposureCommands.ts b/src/cli/releaseExposureCommands.ts index 550aff94ca..1bba9c771e 100644 --- a/src/cli/releaseExposureCommands.ts +++ b/src/cli/releaseExposureCommands.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import type { Logger } from "pino"; import { createReleaseExposureService } from "../composition/releaseExposure.js"; diff --git a/src/cli/reverseEngineeringCommands.ts b/src/cli/reverseEngineeringCommands.ts index 2798c0b8bf..99b78b6e66 100644 --- a/src/cli/reverseEngineeringCommands.ts +++ b/src/cli/reverseEngineeringCommands.ts @@ -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"; diff --git a/src/cli/setupCommands.ts b/src/cli/setupCommands.ts index a5556aa3a4..24ec867ca5 100644 --- a/src/cli/setupCommands.ts +++ b/src/cli/setupCommands.ts @@ -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 { diff --git a/src/cli/strictPositionals.ts b/src/cli/strictPositionals.ts index 9467ddac9f..3830cb6fbf 100644 --- a/src/cli/strictPositionals.ts +++ b/src/cli/strictPositionals.ts @@ -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"; diff --git a/src/cli/utilityCommands.ts b/src/cli/utilityCommands.ts index 083e99a382..30e480bac4 100644 --- a/src/cli/utilityCommands.ts +++ b/src/cli/utilityCommands.ts @@ -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"; diff --git a/src/cliEvidenceCommands.ts b/src/cliEvidenceCommands.ts index c9b1c1de0c..e096d8a0e1 100644 --- a/src/cliEvidenceCommands.ts +++ b/src/cliEvidenceCommands.ts @@ -2,7 +2,8 @@ import { withCommandCancellation } from "./cli/commandCancellation.js"; import { parseCliJsonInput } from "./cli/cliJsonInput.js"; import { analysisInputErrorFromIssues } from "./domain/inputIssueProjection.js"; import { bundleComparisonInputSchema } from "./domain/bundleComparison.js"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { compareEvidenceBundlesCommand, diff --git a/src/main/mcpHttpArguments.ts b/src/main/mcpHttpArguments.ts index e12d055a75..dd2566e789 100644 --- a/src/main/mcpHttpArguments.ts +++ b/src/main/mcpHttpArguments.ts @@ -1,4 +1,5 @@ -import { Help, z } from "incur"; +import { Help } from "incur"; +import { z } from "zod"; import type { HttpHostname } from "../domain/httpHostname.js"; import { diff --git a/src/mcpDoctorOptions.ts b/src/mcpDoctorOptions.ts index 8b46feb5b1..8a4d50c22d 100644 --- a/src/mcpDoctorOptions.ts +++ b/src/mcpDoctorOptions.ts @@ -1,4 +1,4 @@ -import { z } from "incur"; +import { z } from "zod"; import { CLI_DOCUMENT_OUTPUT_FORMATS } from "./cliOutput.js"; diff --git a/tests/acceptance/darwinAvailabilityMcp.test.ts b/tests/acceptance/darwinAvailabilityMcp.test.ts index cec30cd445..7dc4880295 100644 --- a/tests/acceptance/darwinAvailabilityMcp.test.ts +++ b/tests/acceptance/darwinAvailabilityMcp.test.ts @@ -3,7 +3,7 @@ import { join, resolve } from "node:path"; import { Client } from "@modelcontextprotocol/client"; import { StdioClientTransport } from "@modelcontextprotocol/client/stdio"; import { expect } from "vitest"; -import { z } from "incur"; +import { z } from "zod"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; import { parseMcpToolError } from "../fixtures/mcpToolError.js"; import { cliTest } from "../support/cli/cliFixture.js"; diff --git a/tests/boundary/cli/cliContractCommandParity.test.ts b/tests/boundary/cli/cliContractCommandParity.test.ts index cb8984d946..e483d5ede9 100644 --- a/tests/boundary/cli/cliContractCommandParity.test.ts +++ b/tests/boundary/cli/cliContractCommandParity.test.ts @@ -1,4 +1,5 @@ -import { Parser, z } from "incur"; +import { Parser } from "incur"; +import { z } from "zod"; import { describe, expect, it } from "vitest"; import { createCli } from "../../../src/cli.js"; diff --git a/tests/boundary/cli/cliDecimalArguments.test.ts b/tests/boundary/cli/cliDecimalArguments.test.ts index 95b0345262..77db5b4aa1 100644 --- a/tests/boundary/cli/cliDecimalArguments.test.ts +++ b/tests/boundary/cli/cliDecimalArguments.test.ts @@ -1,5 +1,6 @@ import { Ajv2020 } from "ajv/dist/2020.js"; -import { Parser, Schema, z } from "incur"; +import { Parser, Schema } from "incur"; +import { z } from "zod"; import { describe, expect, it } from "vitest"; import { createCli } from "../../../src/cli.js"; diff --git a/tests/boundary/cli/cliDomainFieldSchema.test.ts b/tests/boundary/cli/cliDomainFieldSchema.test.ts index dfb844ebc3..e06d74a24f 100644 --- a/tests/boundary/cli/cliDomainFieldSchema.test.ts +++ b/tests/boundary/cli/cliDomainFieldSchema.test.ts @@ -1,6 +1,7 @@ import { Ajv2020 } from "ajv/dist/2020.js"; import type { AnySchema } from "ajv"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { expect, it } from "vitest"; import { createCli } from "../../../src/cli.js"; diff --git a/tests/boundary/cli/cliInputSchemaRequired.test.ts b/tests/boundary/cli/cliInputSchemaRequired.test.ts index 46439bd18c..c4736327a9 100644 --- a/tests/boundary/cli/cliInputSchemaRequired.test.ts +++ b/tests/boundary/cli/cliInputSchemaRequired.test.ts @@ -1,5 +1,6 @@ import { Ajv2020 } from "ajv/dist/2020.js"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { resolve } from "node:path"; import { describe, expect, it, vi } from "vitest"; diff --git a/tests/boundary/cli/cliTimingArguments.test.ts b/tests/boundary/cli/cliTimingArguments.test.ts index 867e3b5167..34b5e9bf89 100644 --- a/tests/boundary/cli/cliTimingArguments.test.ts +++ b/tests/boundary/cli/cliTimingArguments.test.ts @@ -1,5 +1,6 @@ import { it, expect } from "vitest"; -import { Parser, z } from "incur"; +import { Parser } from "incur"; +import { z } from "zod"; import { splitCliTimingArguments, normalizeCliArguments, diff --git a/tests/boundary/cli/commandEvidenceDelivery.test.ts b/tests/boundary/cli/commandEvidenceDelivery.test.ts index 2a24b87c0d..ae8a346d5a 100644 --- a/tests/boundary/cli/commandEvidenceDelivery.test.ts +++ b/tests/boundary/cli/commandEvidenceDelivery.test.ts @@ -1,6 +1,7 @@ import { unknownTarget } from "../../../src/domain/targetIdentity.js"; import { closeVerifierResources } from "../../../scripts/lib/verifier-cleanup.mjs"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import pino from "pino"; import { readFile, readdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; diff --git a/tests/boundary/cli/completions.test.ts b/tests/boundary/cli/completions.test.ts index 62cbdb868f..6bd5047f87 100644 --- a/tests/boundary/cli/completions.test.ts +++ b/tests/boundary/cli/completions.test.ts @@ -1,5 +1,6 @@ import { resolve } from "node:path"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { expect, it } from "vitest"; import { createCliCompletions } from "../../../src/cli/completions.js"; diff --git a/tests/boundary/cli/contractCommandInputFields.test.ts b/tests/boundary/cli/contractCommandInputFields.test.ts index a799f5e83b..89e7a41d89 100644 --- a/tests/boundary/cli/contractCommandInputFields.test.ts +++ b/tests/boundary/cli/contractCommandInputFields.test.ts @@ -1,4 +1,5 @@ -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import pino from "pino"; import { expect, it } from "vitest"; diff --git a/tests/boundary/cli/contractCommandViewDelivery.test.ts b/tests/boundary/cli/contractCommandViewDelivery.test.ts index 8805d4ed29..0470808044 100644 --- a/tests/boundary/cli/contractCommandViewDelivery.test.ts +++ b/tests/boundary/cli/contractCommandViewDelivery.test.ts @@ -1,4 +1,5 @@ -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import pino from "pino"; import { expect, it } from "vitest"; diff --git a/tests/boundary/cli/defaultAmpRegistration.test.ts b/tests/boundary/cli/defaultAmpRegistration.test.ts index c0041d3d53..4264af5be6 100644 --- a/tests/boundary/cli/defaultAmpRegistration.test.ts +++ b/tests/boundary/cli/defaultAmpRegistration.test.ts @@ -1,7 +1,8 @@ import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { Parser, z } from "incur"; +import { Parser } from "incur"; +import { z } from "zod"; import { decode } from "@toon-format/toon"; import { mcpRegistrationReportSchema } from "../../../src/contracts/mcpRegistration.js"; diff --git a/tests/boundary/cli/filteredFailureOutput.test.ts b/tests/boundary/cli/filteredFailureOutput.test.ts index e57f3bb93f..0726b3e6ae 100644 --- a/tests/boundary/cli/filteredFailureOutput.test.ts +++ b/tests/boundary/cli/filteredFailureOutput.test.ts @@ -1,7 +1,8 @@ import { randomUUID } from "node:crypto"; import { Writable } from "node:stream"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { parse as parseYaml } from "yaml"; import { expect, it } from "vitest"; diff --git a/tests/boundary/cli/jsonLinesOutput.test.ts b/tests/boundary/cli/jsonLinesOutput.test.ts index c5337d7df0..51d779b511 100644 --- a/tests/boundary/cli/jsonLinesOutput.test.ts +++ b/tests/boundary/cli/jsonLinesOutput.test.ts @@ -1,6 +1,7 @@ import { Writable } from "node:stream"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { estimateTokenCount } from "tokenx"; import { describe, expect, it } from "vitest"; diff --git a/tests/boundary/cli/markdownArgumentErrors.test.ts b/tests/boundary/cli/markdownArgumentErrors.test.ts index 351df7e179..c55cee93b3 100644 --- a/tests/boundary/cli/markdownArgumentErrors.test.ts +++ b/tests/boundary/cli/markdownArgumentErrors.test.ts @@ -1,4 +1,5 @@ -import { Cli, Errors, z } from "incur"; +import { Cli, Errors } from "incur"; +import { z } from "zod"; import { parseFragment, type DefaultTreeAdapterTypes } from "parse5"; import { estimateTokenCount } from "tokenx"; import { createMarkdownRenderer, disposeMdItInstance } from "vitepress"; diff --git a/tests/boundary/cli/overnightBatch1CliSchemas.test.ts b/tests/boundary/cli/overnightBatch1CliSchemas.test.ts index 1f65be75c6..28b12c34ac 100644 --- a/tests/boundary/cli/overnightBatch1CliSchemas.test.ts +++ b/tests/boundary/cli/overnightBatch1CliSchemas.test.ts @@ -1,7 +1,8 @@ import { join } from "node:path"; import { Ajv2020 } from "ajv/dist/2020.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { expect, it, vi } from "vitest"; import { createAnalysisExecution } from "../../../src/ports/AnalysisProvider.js"; import type { AdbDeviceAnalysisPort } from "../../../src/application/adb/AdbDeviceAnalysisPort.js"; diff --git a/tests/boundary/cli/reverseEngineeringCommands.test.ts b/tests/boundary/cli/reverseEngineeringCommands.test.ts index df006c20c0..7a43f072a1 100644 --- a/tests/boundary/cli/reverseEngineeringCommands.test.ts +++ b/tests/boundary/cli/reverseEngineeringCommands.test.ts @@ -1,6 +1,7 @@ import { unknownTarget } from "../../../src/domain/targetIdentity.js"; import pino from "pino"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { afterEach, expect, it, vi } from "vitest"; import { rm } from "node:fs/promises"; diff --git a/tests/boundary/cli/routedCommand.test.ts b/tests/boundary/cli/routedCommand.test.ts index be0b677410..3d34c1b998 100644 --- a/tests/boundary/cli/routedCommand.test.ts +++ b/tests/boundary/cli/routedCommand.test.ts @@ -1,4 +1,5 @@ -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import pino from "pino"; import { expect, it } from "vitest"; diff --git a/tests/boundary/cli/strictPositionals.test.ts b/tests/boundary/cli/strictPositionals.test.ts index 45e9d084aa..119d323d94 100644 --- a/tests/boundary/cli/strictPositionals.test.ts +++ b/tests/boundary/cli/strictPositionals.test.ts @@ -1,7 +1,8 @@ import { EVIDENCE_FORMAT_REVISION } from "../../../src/domain/evidenceFormat.js"; import { writeFile } from "node:fs/promises"; import { join } from "node:path"; -import { Cli, z } from "incur"; +import { Cli } from "incur"; +import { z } from "zod"; import { expect, it } from "vitest"; import { createCli } from "../../../src/cli.js"; diff --git a/tests/evaluation/incurImportGuard.test.ts b/tests/evaluation/incurImportGuard.test.ts new file mode 100644 index 0000000000..dea9e2ea22 --- /dev/null +++ b/tests/evaluation/incurImportGuard.test.ts @@ -0,0 +1,29 @@ +import { expect, it } from "vitest"; +import { incurZodImportCount } from "../../scripts/verify/incur-import-guard.mjs"; + +it("counts declarations that take z from incur in every spelling", () => { + expect(incurZodImportCount('import { z } from "incur";')).toBe(1); + expect(incurZodImportCount("import type { z } from 'incur';")).toBe(1); + expect(incurZodImportCount('import { Cli, type z } from "incur";')).toBe(1); + expect(incurZodImportCount('import { z as zod } from "incur";')).toBe(1); + expect(incurZodImportCount('export { z } from "incur";')).toBe(1); + expect( + incurZodImportCount( + 'import {\n Cli,\n z,\n} from "incur";\nconst a = 1;', + ), + ).toBe(1); +}); + +it("ignores other names, other modules and non-declaration text", () => { + expect(incurZodImportCount('import { Cli } from "incur";')).toBe(0); + expect(incurZodImportCount('import { schema as z } from "incur";')).toBe(0); + expect(incurZodImportCount('import { z } from "zod";')).toBe(0); + expect(incurZodImportCount('// import { z } from "incur";')).toBe(0); + expect(incurZodImportCount('/* import { z } from "incur"; */')).toBe(0); + expect( + incurZodImportCount("const fixture = 'import { z } from \"incur\";';"), + ).toBe(0); + expect( + incurZodImportCount('const fixture = `\nimport { z } from "incur";\n`;'), + ).toBe(0); +});