@williamthorsen/nmr 0.33.0 → 0.35.0

package/.readyup/kits/default.js

@@ -1,13 +1,33 @@
-/** @noformat — @generated. Do not edit. Compiled by rdy. */
+/** @noformat -- @generated. Do not edit. Compiled by rdy. */
 /* eslint-disable */
-export const __readyupVersion = "0.30.0";
+export const __readyupVersion = "0.35.0";
 
 
 // .readyup/kits/default.ts
-import { existsSync, globSync, readdirSync as readdirSync2, readFileSync } from "node:fs";
-import { basename, join, sep } from "node:path";
+import { existsSync, globSync, readdirSync as readdirSync2 } from "node:fs";
+import { basename, dirname, join, sep } from "node:path";
+
+// ../../node_modules/.pnpm/@williamthorsen+toolbelt.errors@0.6.3/node_modules/@williamthorsen/toolbelt.errors/dist/esm/4-release/isError.js
+function isError(error) {
+  return error instanceof Error || Object.prototype.toString.call(error) === "[object Error]";
+}
+
+// ../../node_modules/.pnpm/@williamthorsen+toolbelt.errors@0.6.3/node_modules/@williamthorsen/toolbelt.errors/dist/esm/4-release/describeError.js
+function describeError(error) {
+  try {
+    if (isError(error) && typeof error.message === "string" && error.message !== "") {
+      return error.message;
+    }
+    return String(error);
+  } catch {
+    return "[unstringifiable value]";
+  }
+}
+
+// .readyup/kits/default.ts
 import { defineRdyKit } from "readyup";
 import {
+  discoverWorkspaces,
   fileContains,
   fileExists,
   hasDevDependency,
@@ -108,10 +128,8 @@ var TEST_EXTENSIONS = "{ts,tsx}";
 var TEST_GLOB_PREFIX = `**/${TEST_DIR}/**`;
 var TEST_FILE_PATTERN = /\.test\.tsx?$/;
 var ALL_TEST_PATTERNS = [`${TEST_GLOB_PREFIX}/*.test.${TEST_EXTENSIONS}`];
-function findTestFiles(rootDir) {
-  const found = [];
-  collectTestFiles(rootDir, "", false, found);
-  return found.toSorted();
+function findTestFiles(rootDir, options = {}) {
+  return walkTestFiles(rootDir, options, false);
 }
 function hasTierInfix(filePath) {
   const tiers = TIER_NAMES;
@@ -119,18 +137,27 @@ function hasTierInfix(filePath) {
 }
 var TEST_COLLECTION_EXCLUDE = [".git", "coverage", "dist", "node_modules"];
 var TIER_NAMES = ["unit", "tool", "localhost", "remote"];
-function collectTestFiles(dir, relativeDir, inTestDir, found) {
+function collectTestFiles(dir, relativeDir, inTestDir, context) {
   const entries = readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
     const relativePath = relativeDir === "" ? entry.name : `${relativeDir}/${entry.name}`;
     if (entry.isDirectory()) {
-      if (TEST_COLLECTION_EXCLUDE.includes(entry.name)) continue;
-      collectTestFiles(path.join(dir, entry.name), relativePath, inTestDir || entry.name === TEST_DIR, found);
-    } else if (inTestDir && TEST_FILE_PATTERN.test(entry.name)) {
-      found.push(relativePath);
+      if (context.pruned.has(entry.name)) continue;
+      collectTestFiles(path.join(dir, entry.name), relativePath, inTestDir || entry.name === TEST_DIR, context);
+    } else if (inTestDir !== context.misplaced && TEST_FILE_PATTERN.test(entry.name)) {
+      context.found.push(relativePath);
     }
   }
 }
+function walkTestFiles(rootDir, { exclude = [] }, misplaced) {
+  const context = {
+    found: [],
+    misplaced,
+    pruned: /* @__PURE__ */ new Set([...TEST_COLLECTION_EXCLUDE, ...exclude])
+  };
+  collectTestFiles(rootDir, "", false, context);
+  return context.found.toSorted();
+}
 
 // .readyup/kits/default.ts
 var default_default = defineRdyKit({
@@ -240,10 +267,10 @@ var default_default = defineRdyKit({
           fix: "Delete every vitest.standalone.config.* and vitest.integration.config.*. nmr's test scripts select Vitest projects instead of naming config files"
         },
         {
-          name: "vitest.config.ts builds on @williamthorsen/nmr/vitest",
+          name: "every vitest.config builds on @williamthorsen/nmr/vitest",
           severity: "error",
           check: () => vitestConfigBuildsOnSharedConfig(),
-          fix: "Replace vitest.config.ts with: import { defineVitestConfig } from '@williamthorsen/nmr/vitest'; export default defineVitestConfig();"
+          fix: "Replace each listed config with: import { defineVitestConfig } from '@williamthorsen/nmr/vitest'; export default defineVitestConfig(); -- a config that does not call the factory declares no projects, so every tier-selecting test command fails against it. Pass your own settings to the factory as layers to keep them"
         },
         {
           name: "vitest.root.config.ts builds on @williamthorsen/nmr/vitest",
@@ -251,6 +278,12 @@ var default_default = defineRdyKit({
           check: () => vitestRootConfigBuildsOnSharedConfig(),
           fix: "Replace vitest.root.config.ts with: import { defineRootVitestConfig } from '@williamthorsen/nmr/vitest'; export default defineRootVitestConfig({ monorepoRoot: import.meta.dirname });"
         },
+        {
+          name: "every workspace with a Vite config has a Vitest config",
+          severity: "error",
+          check: () => everyViteConfigHasVitestConfig(),
+          fix: "Add a vitest.config.ts calling defineVitestConfig() from @williamthorsen/nmr/vitest beside each listed vite.config -- Vitest stops its config search at the first directory holding either name, so the Vite config otherwise wins and the projects model is never reached"
+        },
         {
           name: "every test file names its isolation tier",
           severity: "error",
@@ -278,6 +311,13 @@ var default_default = defineRdyKit({
           check: () => tazeConfigBuildsOnSharedConfig(),
           fix: "Replace the taze config with: import { defineConfig } from '@williamthorsen/nmr/taze'; export default defineConfig(); \u2014 nmr's upgrade policy reaches a repo only through this file, so without it `nmr upgrade` reports nothing where dependencies are pinned to exact versions"
         },
+        {
+          name: "taze config declares no option taze discards",
+          severity: "warn",
+          quiet: true,
+          check: () => tazeConfigAvoidsClobberedOptions(),
+          fix: "Set these through the upgrade script instead, as rootScripts: { upgrade: 'nmr-report-overrides && nmr-taze --recursive --request-timeout 90000' } in .config/nmr.config.ts, keeping the rest of the default script \u2014 taze's CLI writes a default for each of them over whatever the config file declares, so the value there never reaches taze (antfu-collective/taze#317). nmr already forwards a 30-second request timeout"
+        },
         // -- Audit dependency --------------------------------------------------------
         {
           name: "v11y-check in devDependencies",
@@ -306,11 +346,20 @@ var default_default = defineRdyKit({
 });
 var SCAN_EXCLUDE_DIRS = /* @__PURE__ */ new Set([".git", "coverage", "dist", "node_modules"]);
 var CONFIG_EXTENSIONS = "{ts,mts,cts,js,mjs,cjs}";
+var VITE_CONFIG_PATTERN = `vite.config.${CONFIG_EXTENSIONS}`;
+var VITEST_CONFIG_PATTERN = `vitest.config.${CONFIG_EXTENSIONS}`;
 var SHARED_VITEST_MODULE = "@williamthorsen/nmr/vitest";
 var SHARED_PRETTIER_MODULE = "@williamthorsen/nmr/prettier";
 var INERT_PRETTIER_CONFIGS = [".prettierrc", ".prettierrc.{json,json5,yaml,yml,toml}"];
 var SHARED_TAZE_MODULE = "@williamthorsen/nmr/taze";
 var INERT_TAZE_CONFIGS = [".tazerc", ".tazerc.json", "taze.config.json"];
+var CLOBBERED_TAZE_OPTIONS = [
+  { key: "concurrency", pattern: /\bconcurrency\s*:/ },
+  { key: "githubActions", pattern: /\bgithubActions\s*:\s*(?:false|\{)/ },
+  { key: "ignoreOtherWorkspaces", pattern: /\bignoreOtherWorkspaces\s*:\s*false/ },
+  { key: "nodeVersion", pattern: /\bnodeVersion\s*:\s*false/ },
+  { key: "requestTimeout", pattern: /\brequestTimeout\s*:/ }
+];
 var RE_EXPORT_LINE_PATTERN = /^export\s*(?:\{\s*default\s*}|\*)\s*from\s*['"]\.\.\/[^'"]*['"];?$/;
 var MIN_ESLINT_VERSION = "10.0.0";
 var MIN_STRICT_LINT_VERSION = "9.3.0";
@@ -389,20 +438,41 @@ function hasPrettierConfigKey(cwd) {
     return false;
   }
 }
+function discoverMemberWorkspaces() {
+  try {
+    return { ok: true, workspaces: discoverWorkspaces({ filter: (workspace) => !workspace.isRoot }) };
+  } catch (error) {
+    return { ok: false, detail: `cannot enumerate workspaces: ${describeError(error)}` };
+  }
+}
 function everyTestFileNamesItsTier(cwd = process.cwd()) {
   const untiered = findTestFiles(cwd).filter((path2) => !hasTierInfix(path2));
   if (untiered.length === 0) return true;
   return { ok: false, detail: formatPaths(untiered) };
 }
+function everyViteConfigHasVitestConfig() {
+  const discovery = discoverMemberWorkspaces();
+  if (!discovery.ok) return discovery;
+  const unpaired = discovery.workspaces.flatMap((workspace) => {
+    const viteConfigs = findWorkspaceConfigs(workspace, VITE_CONFIG_PATTERN);
+    if (viteConfigs.length === 0) return [];
+    return findWorkspaceConfigs(workspace, VITEST_CONFIG_PATTERN).length > 0 ? [] : viteConfigs;
+  });
+  if (unpaired.length === 0) return true;
+  return { ok: false, detail: formatPaths(unpaired) };
+}
 function findFiles(patterns, cwd) {
   return globSync(patterns, { cwd, exclude: (path2) => SCAN_EXCLUDE_DIRS.has(basename(path2)) }).map((path2) => path2.split(sep).join("/")).toSorted();
 }
+function findWorkspaceConfigs(workspace, pattern) {
+  return findFiles([pattern], workspace.absolutePath).map((name) => `${workspace.dir}/${name}`);
+}
 function formatPaths(paths) {
   return `${paths.length} found:
 ${paths.map((path2) => `      ${path2}`).join("\n")}`;
 }
 function getMinVersion() {
-  const picked = { "version": "0.33.0" };
+  const picked = { "version": "0.35.0" };
   if (typeof picked["version"] !== "string") {
     throw new TypeError("nmr/package.json: 'version' must be a string");
   }
@@ -418,11 +488,17 @@ function hasSupportedStrictLintVersion() {
     exempt: resolvesVersionViaWorkspace
   });
 }
+function hasViteConfigBeside(cwd, relativePath) {
+  return findFiles([VITE_CONFIG_PATTERN], join(cwd, dirname(relativePath))).length > 0;
+}
 function importsSharedExport(content, exportName, moduleSpecifier) {
   if (content === void 0) return false;
   const pattern = new RegExp(String.raw`import\s*\{[^}]*\b${exportName}\b[^}]*\}\s*from\s*['"]${moduleSpecifier}['"]`);
   return pattern.test(content);
 }
+function isOwnedByReExportCheck(cwd, relativePath) {
+  return isReExportOnly(readFileIn(cwd, relativePath)) && !hasViteConfigBeside(cwd, relativePath);
+}
 function isReExportOnly(content) {
   if (content === void 0) return false;
   const statements = content.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
@@ -438,8 +514,8 @@ function noPnpmFieldInPackageJson(cwd = process.cwd()) {
   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)));
+  const nonRootConfigs = findFiles([`**/${VITEST_CONFIG_PATTERN}`], cwd).filter((path2) => path2.includes("/"));
+  const reExports = nonRootConfigs.filter((path2) => isOwnedByReExportCheck(cwd, path2));
   if (reExports.length === 0) return true;
   return { ok: false, detail: formatPaths(reExports) };
 }
@@ -482,11 +558,7 @@ function noWorkspaceRunScriptReferences() {
   };
 }
 function readFileIn(cwd, relativePath) {
-  try {
-    return readFileSync(join(cwd, relativePath), "utf8");
-  } catch {
-    return void 0;
-  }
+  return readFile(join(cwd, relativePath));
 }
 function readPnpmFieldKeys(content) {
   if (content === void 0) return void 0;
@@ -514,6 +586,18 @@ function tazeConfigBuildsOnSharedConfig(cwd = process.cwd()) {
   if (stale.length === 0) return true;
   return { ok: false, detail: `does not import defineConfig from ${SHARED_TAZE_MODULE}: ${stale.join(", ")}` };
 }
+function tazeConfigAvoidsClobberedOptions(cwd = process.cwd()) {
+  const configs = findFiles([`taze.config.${CONFIG_EXTENSIONS}`], cwd);
+  const findings = [];
+  for (const relativePath of configs) {
+    const content = readFileIn(cwd, relativePath);
+    if (content === void 0) continue;
+    const discarded = CLOBBERED_TAZE_OPTIONS.filter(({ pattern }) => pattern.test(content)).map(({ key }) => key);
+    if (discarded.length > 0) findings.push(`${relativePath}: ${discarded.join(", ")}`);
+  }
+  if (findings.length === 0) return true;
+  return { ok: false, detail: formatPaths(findings) };
+}
 function describeMissingTazeConfig(cwd) {
   const inert = findFiles(INERT_TAZE_CONFIGS, cwd);
   if (inert.length > 0) return `holds no code to call the factory: ${inert.join(", ")}`;
@@ -524,8 +608,18 @@ function toolVersionsHasNoPnpm() {
   if (content === void 0) return true;
   return !/^pnpm\s/m.test(content);
 }
-function vitestConfigBuildsOnSharedConfig(cwd = process.cwd()) {
-  return checkRootVitestConfig("vitest.config", "defineVitestConfig", cwd);
+function vitestConfigBuildsOnSharedConfig() {
+  const cwd = process.cwd();
+  const rootConfigs = findFiles([VITEST_CONFIG_PATTERN], cwd);
+  if (rootConfigs.length === 0) return { ok: false, detail: "vitest.config.ts is missing" };
+  const discovery = discoverMemberWorkspaces();
+  if (!discovery.ok) return discovery;
+  const workspaceConfigs = discovery.workspaces.flatMap((workspace) => findWorkspaceConfigs(workspace, VITEST_CONFIG_PATTERN)).filter((relativePath) => !isOwnedByReExportCheck(cwd, relativePath));
+  const stale = [...rootConfigs, ...workspaceConfigs].filter(
+    (relativePath) => !importsSharedExport(readFileIn(cwd, relativePath), "defineVitestConfig", SHARED_VITEST_MODULE)
+  );
+  if (stale.length === 0) return true;
+  return { ok: false, detail: formatPaths(stale) };
 }
 function vitestRootConfigBuildsOnSharedConfig(cwd = process.cwd()) {
   return checkRootVitestConfig("vitest.root.config", "defineRootVitestConfig", cwd);
@@ -533,12 +627,14 @@ function vitestRootConfigBuildsOnSharedConfig(cwd = process.cwd()) {
 export {
   default_default as default,
   everyTestFileNamesItsTier,
+  everyViteConfigHasVitestConfig,
   hasSupportedEslintVersion,
   hasSupportedStrictLintVersion,
   noPnpmFieldInPackageJson,
   noReExportOnlyVitestConfigs,
   noRetiredVitestConfigs,
   prettierConfigBuildsOnSharedConfig,
+  tazeConfigAvoidsClobberedOptions,
   tazeConfigBuildsOnSharedConfig,
   vitestConfigBuildsOnSharedConfig,
   vitestRootConfigBuildsOnSharedConfig

package/.readyup/manifest.json

@@ -2,18 +2,21 @@
   "version": 1,
   "kits": [
     {
+      "bundledDependencies": {
+        "@williamthorsen/toolbelt.errors": "0.6.3"
+      },
       "checklists": [
         "nmr"
       ],
-      "esbuildVersion": "0.28.1",
+      "esbuildVersion": "0.28.2",
       "inputs": [
         {
-          "hash": "904ac753",
+          "hash": "b67d9796",
           "kind": "module",
           "path": "kits/default.ts"
         },
         {
-          "hash": "1cd4c58d",
+          "hash": "7a897007",
           "kind": "inline",
           "path": "../package.json",
           "paths": [
@@ -26,22 +29,22 @@
           "path": "../src/default-scripts.ts"
         },
         {
-          "hash": "b42c7523",
+          "hash": "c53d0c51",
           "kind": "module",
           "path": "../src/resolve-scripts.ts"
         },
         {
-          "hash": "c2d21075",
+          "hash": "2dfde614",
           "kind": "module",
           "path": "../src/tiers.ts"
         }
       ],
       "name": "default",
       "path": "kits/default.js",
-      "readyupVersion": "0.30.0",
+      "readyupVersion": "0.35.0",
       "source": "kits/default.ts",
-      "sourceHash": "904ac753",
-      "targetHash": "2b35e5fd"
+      "sourceHash": "b67d9796",
+      "targetHash": "3cd6b2d0"
     }
   ]
 }