@williamthorsen/nmr 0.30.0 → 0.32.0

package/.readyup/kits/default.js

@@ -1,6 +1,6 @@
 /** @noformat — @generated. Do not edit. Compiled by rdy. */
 /* eslint-disable */
-export const __readyupVersion = "0.26.0";
+export const __readyupVersion = "0.28.0";
 
 
 // .readyup/kits/default.ts
@@ -20,10 +20,12 @@ import {
 
 // src/default-scripts.ts
 var GATE_PROJECTS = "--project unit --project tool";
+var TYPECHECK_STEP = { run: "typecheck", declinesArgs: true };
+var ROOT_TYPECHECK_STEP = { run: "root:typecheck", declinesArgs: true };
 var workspaceScripts = {
   build: ["compile"],
-  check: ["typecheck", "fmt:check", "lint:check", "test"],
-  "check:strict": ["typecheck", "fmt:check", "lint:strict", "test:coverage"],
+  check: [TYPECHECK_STEP, "fmt:check", "lint:check", "test"],
+  "check:strict": [TYPECHECK_STEP, "fmt:check", "lint:strict", "test:coverage"],
   clean: "nmr-clean",
   compile: "nmr-compile",
   fix: ["lint", "fmt"],
@@ -33,6 +35,7 @@ var workspaceScripts = {
   lint: "eslint --fix .",
   "lint:check": "eslint .",
   "lint:strict": "strict-lint",
+  "report-catalog": "nmr-report-catalog",
   test: `pnpm exec vitest ${GATE_PROJECTS}`,
   "test:all": "pnpm exec vitest",
   "test:coverage": `pnpm exec vitest ${GATE_PROJECTS} --coverage`,
@@ -40,8 +43,9 @@ var workspaceScripts = {
   "test:unit": "pnpm exec vitest --project unit",
   "test:watch": `pnpm exec vitest ${GATE_PROJECTS} --watch`,
   typecheck: "tsgo --noEmit",
-  // Without `--include-locked`, nothing would be reported in a repo that pins exact version numbers.
-  upgrade: "nmr-taze --include-locked",
+  // Without `--include-locked`, nothing would be reported in a repo that pins exact version numbers. The
+  // command is a string because neither half names an nmr command: both are binaries.
+  upgrade: "nmr-report-catalog && nmr-taze --include-locked",
   "view-coverage": "open coverage/index.html"
 };
 var rootScripts = {
@@ -49,10 +53,11 @@ var rootScripts = {
   "audit:dev": "pnpm exec v11y --dev",
   "audit:prod": "pnpm exec v11y --prod",
   build: ["-R build"],
-  check: ["typecheck", "fmt:check", "lint:check", "test"],
-  "check:strict": ["typecheck", "fmt:check", "lint:strict", "test:coverage"],
-  // Excludes the audit, which in CI has a workflow of its own.
-  ci: ["build", "check:strict"],
+  check: [TYPECHECK_STEP, "fmt:check", "lint:check", "test"],
+  "check:strict": [TYPECHECK_STEP, "fmt:check", "lint:strict", "test:coverage"],
+  // Excludes the audit, which in CI has a workflow of its own. The build is what the narrowed check runs
+  // against, so it declines the arguments rather than being narrowed by them.
+  ci: [{ run: "build", declinesArgs: true }, "check:strict"],
   clean: "nmr-clean",
   fix: ["lint", "fmt"],
   "fix:check": ["fmt:check", "lint:check"],
@@ -61,10 +66,11 @@ var rootScripts = {
   lint: "eslint --fix .",
   "lint:check": "eslint .",
   "lint:strict": "strict-lint",
-  // The audit costs seconds and `ci` costs minutes, so the cheap gate fails first.
-  prepush: ["audit", "ci"],
+  // The audit costs seconds and `ci` costs minutes, so the cheap gate fails first. The audit reads the
+  // dependency tree, which no argument narrowing the code under test says anything about.
+  prepush: [{ run: "audit", declinesArgs: true }, "ci"],
   "report-overrides": "nmr-report-overrides",
-  "root:check": ["root:typecheck", "fmt:check", "root:lint:check", "root:test"],
+  "root:check": [ROOT_TYPECHECK_STEP, "fmt:check", "root:lint:check", "root:test"],
   "root:lint": "eslint --fix --ignore-pattern 'packages/**' .",
   "root:lint:check": "eslint --ignore-pattern 'packages/**' .",
   "root:lint:strict": "strict-lint --ignore-pattern 'packages/**' .",
@@ -73,15 +79,20 @@ var rootScripts = {
   "root:test:tool": "vitest --config ./vitest.root.config.ts --project tool",
   "root:test:unit": "vitest --config ./vitest.root.config.ts --project unit",
   "root:typecheck": "tsgo --noEmit",
-  "root:upgrade": "nmr-taze --include-locked",
+  // Carries the override report for the same reason `upgrade` does: both end in the tool that rewrites a
+  // `pnpm.overrides` block, so both need the reporter's rejection ahead of them.
+  "root:upgrade": "nmr-report-overrides && nmr-taze --include-locked",
   test: ["root:test", "-R test"],
   "test:all": ["root:test:all", "-R test:all"],
   "test:coverage": ["root:test", "-R test:coverage"],
   "test:tool": ["root:test:tool", "-R test:tool"],
   "test:unit": ["root:test:unit", "-R test:unit"],
   "test:watch": `vitest ${GATE_PROJECTS} --watch`,
-  typecheck: ["root:typecheck", "-R typecheck"],
-  // The command must be a string rather than a composite: Passthrough args attach to the chain's last command.
+  // Neither step is narrowable, so `nmr typecheck <file>` is rejected rather than checking that file under
+  // default options at the root and hunting for it in every package.
+  typecheck: [ROOT_TYPECHECK_STEP, { run: "-R typecheck", declinesArgs: true }],
+  // The command is a string because neither half names an nmr command: both are binaries, and a composite
+  // element can name only a command.
   upgrade: "nmr-report-overrides && nmr-taze --include-locked --recursive"
 };
 
@@ -168,6 +179,13 @@ var default_default = defineRdyKit({
           check: toolVersionsHasNoPnpm,
           fix: "Remove pnpm from .tool-versions \u2014 manage via packageManager field and corepack"
         },
+        {
+          name: "no package.json declares a pnpm field",
+          severity: "error",
+          quiet: true,
+          check: () => noPnpmFieldInPackageJson(),
+          fix: "Move these settings into pnpm-workspace.yaml, quoting each version under `overrides`, or run `pnpx codemod run pnpm-v10-to-v11`. pnpm 11 reads no key from the `pnpm` field, so an override left there pins nothing while an upgrade run with `--write` goes on rewriting it"
+        },
         {
           name: ".config/nmr.config.ts uses defineConfig",
           severity: "recommend",
@@ -376,7 +394,7 @@ function formatPaths(paths) {
 ${paths.map((path2) => `      ${path2}`).join("\n")}`;
 }
 function getMinVersion() {
-  const picked = { "version": "0.30.0" };
+  const picked = { "version": "0.32.0" };
   if (typeof picked["version"] !== "string") {
     throw new TypeError("nmr/package.json: 'version' must be a string");
   }
@@ -402,6 +420,15 @@ function isReExportOnly(content) {
   const statements = content.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
   return statements.length > 0 && statements.every((line) => RE_EXPORT_LINE_PATTERN.test(line));
 }
+function noPnpmFieldInPackageJson(cwd = process.cwd()) {
+  const declaring = findFiles(["**/package.json"], cwd).flatMap((relativePath) => {
+    const keys = readPnpmFieldKeys(readFileIn(cwd, relativePath));
+    if (keys === void 0) return [];
+    return [keys.length > 0 ? `${relativePath} (${keys.join(", ")})` : relativePath];
+  });
+  if (declaring.length === 0) return true;
+  return { ok: false, detail: formatPaths(declaring) };
+}
 function noReExportOnlyVitestConfigs(cwd = process.cwd()) {
   const nonRootConfigs = findFiles([`**/vitest.config.${CONFIG_EXTENSIONS}`], cwd).filter((path2) => path2.includes("/"));
   const reExports = nonRootConfigs.filter((path2) => isReExportOnly(readFileIn(cwd, path2)));
@@ -453,6 +480,18 @@ function readFileIn(cwd, relativePath) {
     return void 0;
   }
 }
+function readPnpmFieldKeys(content) {
+  if (content === void 0) return void 0;
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord(parsed)) return void 0;
+  const pnpm = parsed["pnpm"];
+  return isRecord(pnpm) ? Object.keys(pnpm).toSorted() : void 0;
+}
 function resolvesVersionViaWorkspace(range) {
   return WORKSPACE_VERSION_MARKERS.some((marker) => range.startsWith(marker));
 }
@@ -472,6 +511,7 @@ export {
   everyTestFileNamesItsTier,
   hasSupportedEslintVersion,
   hasSupportedStrictLintVersion,
+  noPnpmFieldInPackageJson,
   noReExportOnlyVitestConfigs,
   noRetiredVitestConfigs,
   prettierConfigBuildsOnSharedConfig,

package/.readyup/manifest.json

@@ -5,12 +5,43 @@
       "checklists": [
         "nmr"
       ],
+      "esbuildVersion": "0.28.1",
+      "inputs": [
+        {
+          "hash": "67afdcb4",
+          "kind": "module",
+          "path": "kits/default.ts"
+        },
+        {
+          "hash": "2bd89ec9",
+          "kind": "inline",
+          "path": "../package.json",
+          "paths": [
+            "version"
+          ]
+        },
+        {
+          "hash": "3dfc2ee7",
+          "kind": "module",
+          "path": "../src/default-scripts.ts"
+        },
+        {
+          "hash": "b42c7523",
+          "kind": "module",
+          "path": "../src/resolve-scripts.ts"
+        },
+        {
+          "hash": "c2d21075",
+          "kind": "module",
+          "path": "../src/tiers.ts"
+        }
+      ],
       "name": "default",
       "path": "kits/default.js",
-      "readyupVersion": "0.26.0",
+      "readyupVersion": "0.28.0",
       "source": "kits/default.ts",
-      "sourceHash": "7b2a223f",
-      "targetHash": "bdca19db"
+      "sourceHash": "67afdcb4",
+      "targetHash": "b923a4b4"
     }
   ]
 }