@williamthorsen/toolbelt.numbers 7.0.0 → 7.0.2

package/.readyup/kits/default.js

@@ -1,6 +1,6 @@
-/** @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.34.0";
 
 
 // ../adoption/src/conventions/path-predicates.ts
@@ -48,13 +48,14 @@ import { defineRdyKit } from "readyup";
 import {
   buildFindingReport,
   countPackageUsage,
-  discoverWorkspaces,
   readTrackedSources
 } from "readyup/check-utils";
 var NOT_A_REPO = "the project is not a git working tree, and these checks read the files git tracks";
-var SELF = "this project publishes the package these checks are for";
+var NOTHING_TO_REPORT = { findings: [] };
 function defineAdoptionKit(spec) {
+  assertCheckIdsAreUnique();
   const cache = {};
+  const adoptedPackage = { exportNames: spec.exportNames, packageName: spec.packageName };
   return defineRdyKit({
     description: spec.description,
     defaultSeverity: "warn",
@@ -63,14 +64,27 @@ function defineAdoptionKit(spec) {
         name: "adoption",
         checks: spec.checks.map((check) => ({
           name: check.name,
+          id: check.id,
           ...check.severity !== void 0 && { severity: check.severity },
-          skip: skipUnlessProjectIsAccountable,
+          skip: skipUnlessProjectHoldsSources,
           check: () => reportKinds(check.kinds),
           fix: check.fix
         }))
       }
     ]
   });
+  function assertCheckIdsAreUnique() {
+    const seen = /* @__PURE__ */ new Set();
+    const duplicated = /* @__PURE__ */ new Set();
+    for (const { id } of spec.checks) {
+      if (seen.has(id)) duplicated.add(id);
+      seen.add(id);
+    }
+    if (duplicated.size > 0) {
+      const ids = [...duplicated].toSorted().join(", ");
+      throw new Error(`${spec.packageName}'s kit gives one id to more than one check: ${ids}`);
+    }
+  }
   function loadSummary() {
     cache.summary ??= readProject();
     return cache.summary;
@@ -79,203 +93,26 @@ function defineAdoptionKit(spec) {
     const sources = await readTrackedSources(spec.pathFilter);
     if (sources === void 0) return void 0;
     return {
-      adoptedCount: countPackageUsage(sources, {
-        exportNames: spec.exportNames,
-        packageName: spec.packageName
-      }),
+      adoptedCount: countPackageUsage(sources, adoptedPackage),
       findings: sources.flatMap((source) => spec.detect(source.text).map((site) => ({ ...site, path: source.path }))),
-      sourceCount: sources.length
+      sources
     };
   }
   async function reportKinds(kinds) {
     const summary = await loadSummary();
-    if (summary === void 0) return { ok: true };
+    if (summary === void 0) return NOTHING_TO_REPORT;
     return buildFindingReport({
       adoptedCount: summary.adoptedCount,
       findings: summary.findings,
+      ownImplementation: { ...adoptedPackage, sources: summary.sources },
       shouldReport: (finding) => kinds.includes(finding.kind)
     });
   }
-  async function skipUnlessProjectIsAccountable() {
-    if (discoverWorkspaces().some((workspace) => workspace.name === spec.packageName)) return SELF;
+  async function skipUnlessProjectHoldsSources() {
     const summary = await loadSummary();
     if (summary === void 0) return NOT_A_REPO;
-    return summary.sourceCount === 0 ? spec.noSourcesReason : false;
-  }
-}
-
-// ../adoption/src/portable/blankNonCode.ts
-var REGEX_PRECEDERS = /* @__PURE__ */ new Set([
-  "!",
-  "%",
-  "&",
-  "(",
-  "*",
-  "+",
-  ",",
-  "-",
-  ":",
-  ";",
-  "=",
-  ">",
-  "?",
-  "[",
-  "^",
-  "{",
-  "|",
-  "~"
-]);
-var EXPRESSION_KEYWORDS2 = /* @__PURE__ */ new Set([
-  "await",
-  "case",
-  "delete",
-  "do",
-  "else",
-  "in",
-  "instanceof",
-  "new",
-  "of",
-  "return",
-  "typeof",
-  "void",
-  "yield"
-]);
-var WORD_CHAR = /[\w$]/;
-function blankNonCode(source) {
-  const scan = { out: source.split(""), source };
-  const start = source.startsWith("#!") ? blankSpan(scan, 0, findLineEnd(source, 0)) : 0;
-  scanCode(scan, start, false);
-  return scan.out.join("");
-}
-function blankQuoted(scan, start, quote) {
-  const { source } = scan;
-  let index = start + 1;
-  while (index < source.length) {
-    const char = source[index];
-    if (char === "\\") {
-      index += 2;
-      continue;
-    }
-    if (char === "\n") break;
-    if (char === quote) return blankSpan(scan, start + 1, index) + 1;
-    index += 1;
-  }
-  return start + 1;
-}
-function blankSpan(scan, from, to) {
-  for (let index = from; index < to; index += 1) {
-    const char = scan.source[index];
-    if (char !== "\n" && char !== "\r") scan.out[index] = " ";
-  }
-  return to;
-}
-function blankTemplate(scan, start) {
-  const { source } = scan;
-  let index = start + 1;
-  let textStart = index;
-  while (index < source.length) {
-    const char = source[index];
-    if (char === "\\") {
-      index += 2;
-      continue;
-    }
-    if (char === "`") return blankSpan(scan, textStart, index) + 1;
-    if (char === "$" && source[index + 1] === "{") {
-      blankSpan(scan, textStart, index);
-      const close = scanCode(scan, index + 2, true);
-      index = close < source.length ? close + 1 : close;
-      textStart = index;
-      continue;
-    }
-    index += 1;
-  }
-  return blankSpan(scan, textStart, source.length);
-}
-function findBlockCommentEnd(source, from) {
-  const end = source.indexOf("*/", from + 2);
-  return end === -1 ? source.length : end + 2;
-}
-function findLineEnd(source, from) {
-  const end = source.indexOf("\n", from);
-  return end === -1 ? source.length : end;
-}
-function findRegexEnd(source, start) {
-  let index = start + 1;
-  let isInClass = false;
-  while (index < source.length) {
-    const char = source[index];
-    if (char === "\\") {
-      index += 2;
-      continue;
-    }
-    if (char === "\n") return void 0;
-    if (char === "[") isInClass = true;
-    else if (char === "]") isInClass = false;
-    else if (char === "/" && !isInClass) return index + 1;
-    index += 1;
-  }
-  return void 0;
-}
-function findWordEnd(source, from) {
-  let index = from;
-  while (index < source.length && WORD_CHAR.test(source[index] ?? "")) index += 1;
-  return index;
-}
-function scanCode(scan, from, isInterpolation) {
-  const { source } = scan;
-  let previousToken = "";
-  let braceDepth = 0;
-  let index = from;
-  while (index < source.length) {
-    const char = source[index] ?? "";
-    const next = source[index + 1];
-    if (char === "/" && next === "/") {
-      index = blankSpan(scan, index, findLineEnd(source, index));
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      index = blankSpan(scan, index, findBlockCommentEnd(source, index));
-      continue;
-    }
-    if (char === "'" || char === '"') {
-      index = blankQuoted(scan, index, char);
-      previousToken = char;
-      continue;
-    }
-    if (char === "`") {
-      index = blankTemplate(scan, index);
-      previousToken = char;
-      continue;
-    }
-    if (char === "/" && startsRegex(previousToken)) {
-      const end = findRegexEnd(source, index);
-      if (end !== void 0) {
-        blankSpan(scan, index + 1, end - 1);
-        index = end;
-        previousToken = "/";
-        continue;
-      }
-    }
-    if (isInterpolation && char === "{") braceDepth += 1;
-    else if (isInterpolation && char === "}") {
-      if (braceDepth === 0) return index;
-      braceDepth -= 1;
-    }
-    if (WORD_CHAR.test(char)) {
-      const end = findWordEnd(source, index);
-      previousToken = source.slice(index, end);
-      index = end;
-      continue;
-    }
-    if (!/\s/.test(char)) previousToken = char;
-    index += 1;
+    return summary.sources.length === 0 ? spec.noSourcesReason : false;
   }
-  return index;
-}
-function startsRegex(previousToken) {
-  if (previousToken === "") return true;
-  if (previousToken.length === 1) return REGEX_PRECEDERS.has(previousToken);
-  return EXPRESSION_KEYWORDS2.has(previousToken);
 }
 
 // ../adoption/src/portable/condenseWhitespace.ts
@@ -283,15 +120,6 @@ function condenseWhitespace(text) {
   return text.replaceAll(/\s+/g, " ");
 }
 
-// ../adoption/src/portable/getLineAtOffset.ts
-function getLineAtOffset(source, offset) {
-  let line = 1;
-  for (let index = 0; index < offset; index += 1) {
-    if (source[index] === "\n") line += 1;
-  }
-  return line;
-}
-
 // ../adoption/src/portable/readBalancedGroup.ts
 var PARENTHESES = { close: ")", open: "(" };
 function readBalancedGroup(source, from, delimiters) {
@@ -316,6 +144,9 @@ function readAnchoredWindow(source, offset, lengths) {
   };
 }
 
+// ../adoption/src/mod.ts
+import { blankNonCode, getLineAtOffset } from "readyup/check-utils";
+
 // src/readiness/adoptedExports.ts
 var ADOPTED_EXPORTS = [
   "clamp",
@@ -448,18 +279,21 @@ var default_default = defineAdoptionKit({
   checks: [
     {
       name: "No source clamps a value by hand",
+      id: "no-hand-rolled-clamp",
       kinds: ["clamp-nest"],
       severity: "recommend",
       fix: `Replace each expression named above with clamp from ${PACKAGE_NAME}/candidate, called as clamp(value, { min, max }). It is not a silent substitution: clamp throws a RangeError on a reversed range or a NaN bound, where the nested Math calls return a value for both. Reference: ${README_URL}`
     },
     {
       name: "No source rounds to decimal places by hand",
+      id: "no-hand-rolled-round",
       kinds: ["round-scale"],
       severity: "recommend",
       fix: `Replace each expression named above with round from ${PACKAGE_NAME}/candidate, called as round(value, places). The substitution is exact: round scales by the same power of ten these sites write out. Reference: ${README_URL}`
     },
     {
       name: "No source derives a random integer by hand",
+      id: "no-hand-rolled-random-integer",
       kinds: ["random-integer"],
       severity: "recommend",
       fix: `Replace each expression named above with pickInteger from ${PACKAGE_NAME}/candidate, which also takes a seed. Mind the bound: Math.floor(Math.random() * N) stops at N - 1, where pickInteger's max is inclusive, so the replacement is pickInteger({ max: N - 1 }). A site indexing an array is left to toolbelt.arrays, whose pickItem covers it. Reference: ${README_URL}`

package/.readyup/manifest.json

@@ -19,30 +19,20 @@
           "path": "../../adoption/src/conventions/site-handoffs.ts"
         },
         {
-          "hash": "737a39d2",
+          "hash": "781c3f53",
           "kind": "module",
           "path": "../../adoption/src/kits/defineAdoptionKit.ts"
         },
         {
-          "hash": "29115f53",
+          "hash": "6e5a8dda",
           "kind": "module",
           "path": "../../adoption/src/mod.ts"
         },
-        {
-          "hash": "6617674b",
-          "kind": "module",
-          "path": "../../adoption/src/portable/blankNonCode.ts"
-        },
         {
           "hash": "e8d0444d",
           "kind": "module",
           "path": "../../adoption/src/portable/condenseWhitespace.ts"
         },
-        {
-          "hash": "4da99027",
-          "kind": "module",
-          "path": "../../adoption/src/portable/getLineAtOffset.ts"
-        },
         {
           "hash": "b6d99ce7",
           "kind": "module",
@@ -59,7 +49,7 @@
           "path": "../../adoption/src/portable/readBalancedGroup.ts"
         },
         {
-          "hash": "824d5042",
+          "hash": "e6df5682",
           "kind": "module",
           "path": "kits/default.ts"
         },
@@ -91,10 +81,10 @@
       ],
       "name": "default",
       "path": "kits/default.js",
-      "readyupVersion": "0.30.0",
+      "readyupVersion": "0.34.0",
       "source": "kits/default.ts",
-      "sourceHash": "824d5042",
-      "targetHash": "8fa7ed41"
+      "sourceHash": "e6df5682",
+      "targetHash": "44b320aa"
     }
   ]
 }

package/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 All notable changes to this project will be documented in this file.
 
+## 7.0.2 — 2026-08-28
+
+### Refactoring
+
+- Upgrade eslint-config-typescript to v12.0.1 and satisfy its new rules (#236)
+
+  Upgrades `@williamthorsen/eslint-config-typescript` to v12 and fixes violations surfaced by the new rules banning unpublished barrels and floating disposables.
+
+### Dependencies
+
+- Upgrade all deps to latest version
+- Upgrade deps to latest version
+- Upgrade all deps to latest version
+
+## 7.0.1 — 2026-08-24
+
+### Bug fixes
+
+- Stop the adoption kits from blanking code after `++`, `!`, and keyword-named members (#208)
+
+  Fixes an issue where the `errors`, `numbers`, and `vitest` adoption kits stopped reading a line's code after a postfix `++`, a non-null `!`, or a property spelled like a keyword. The source blanker each kit runs before its anchor scan read the `/` that followed as the opening of a regular expression and blanked to the line's next `/`, so a replaceable idiom written after one of the three went unreported.
+
+  `@williamthorsen/toolbelt.adoption` now takes `blankNonCode` and `getLineAtOffset` from `readyup/check-utils` in place of the copies it held, which had fallen behind readyup's on those three cases.
+
+### Internal
+
+- Migrate the adoption kits onto FindingOutcome and add check ids (#217)
+
+  Upgrades `readyup` to 0.32.0 and migrates `defineAdoptionKit` onto the `FindingOutcome` that `buildFindingReport` returns as of 0.31.0.
+
+  Gives every adoption check an `id`, which a consumer's `rdy-ignore` pragma names to suppress that one check; a pragma naming none still silences every check on the line. The kits of `@williamthorsen/toolbelt.errors`, `@williamthorsen/toolbelt.numbers`, and `@williamthorsen/toolbelt.vitest` each declare ids, and `defineAdoptionKit` refuses a kit that gives one id to two checks.
+
+- Hold this repo to its own adoption kits and exempt each package's implementation (#218)
+
+  Removes the exemption that kept this repository out of its own adoption kits. `rdy run --packages` now covers this repo like any other project.
+
+  Each package's own implementation stays exempt, but that exemption now covers the function alone rather than the whole repository.
+
 ## 7.0.0 — 2026-08-21
 
 ### Features

package/README.md

@@ -2,27 +2,7 @@
 
 Utility functions for working with numbers.
 
-<!-- section:release-notes -->
-## Release notes — v7.0.0 (2026-08-21)
-
-### Features
-
-- 🚨 **Breaking:** Promote clamp to the candidate tier with a stricter bounds contract (#185)
-
-  Promotes `clamp` to `@williamthorsen/toolbelt.numbers/candidate` and tightens its bounds contract: A `NaN` bound now throws a `RangeError`, where it previously returned `NaN` silently. A `NaN` value still passes through. Publishes the bounds type as `ClampBounds`, whose optional properties admit `undefined`, so a bound that may be absent typechecks under `exactOptionalPropertyTypes`.
-
-  Migration: `clamp` is no longer exported from the `/draft` subpath; consumers import it from `/candidate`.
-
-- Add a ReadyUp adoption kit to `numbers` (#188)
-
-  Adds a ReadyUp adoption kit to `@williamthorsen/toolbelt.numbers`. When run against a project, the kit identifies hand-rolled code that can be replaced by the package's `clamp`, `round`, or `pickInteger` functions.
-
-### Bug fixes
-
-- Blank comments and literals before a detector reads a source (#191)
-
-  Fixes the issue that the `errors`, `numbers`, and `vitest` adoption kits' detectors did not distinguish code from comments and literals, and so flagged a pattern written in a comment or a string as a candidate replacement site. Each detector now blanks every comment, string, template literal, and regular expression before its anchor scan, leaving interpolated expressions intact.
-<!-- /section:release-notes -->
+<!-- section:release-notes --><!-- /section:release-notes -->
 
 ## Installation
 
@@ -93,6 +73,13 @@ A random integer used as an array subscript is left alone. That site belongs to
 
 Bootstrap wrappers under `bin/` are exempt: such a wrapper imports only builtins so its build-first message survives an incomplete install, and importing this package there would replace that message with a module-resolution failure. Tests are exempt too, since they compute these values deliberately.
 
+A reviewed site is silenced by an `rdy-ignore` pragma on its own line, or `rdy-ignore-next-line` on the line above. A pragma naming a check's id suppresses that check alone; with no id it covers every check on the line. A failed check prints its id ahead of its fraction, which is the form to write:
+
+```ts
+// rdy-ignore-next-line toolbelt.numbers/no-hand-rolled-clamp -- a reversed range is unreachable here
+const bounded = Math.max(min, Math.min(max, value));
+```
+
 Add the package to `.config/readyup.config.ts` to include it in a routine sweep:
 
 ```ts

package/dist/esm/3-candidate/index.d.ts

@@ -1,3 +1,4 @@
+export type { Seed } from '../internal/evaluateSeed.js';
 export { clamp, type ClampBounds } from './clamp.js';
 export { generateRandom } from './generateRandom.js';
 export { isIntegerString, safeParseInteger } from './integer-string.js';
@@ -6,4 +7,3 @@ export { pickInteger } from './pickInteger.js';
 export { round } from './round.js';
 export { scale } from './scale.js';
 export { IntSeededRng, SeededRng } from './seeded-rng.js';
-export * from './types.js';

package/dist/esm/3-candidate/index.js

@@ -6,4 +6,3 @@ export { pickInteger } from "./pickInteger.js";
 export { round } from "./round.js";
 export { scale } from "./scale.js";
 export { IntSeededRng, SeededRng } from "./seeded-rng.js";
-export * from "./types.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@williamthorsen/toolbelt.numbers",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Utility functions for working with numbers",
   "keywords": [
     "esm",
@@ -47,9 +47,9 @@
   ],
   "devDependencies": {
     "esbuild": "0.28.2",
-    "readyup": "0.30.0",
+    "readyup": "0.34.0",
     "@williamthorsen/toolbelt.adoption": "0.1.0",
-    "@williamthorsen/toolbelt.testing": "0.3.0"
+    "@williamthorsen/toolbelt.testing": "0.5.0"
   },
   "engines": {
     "node": ">=24.0.0"

package/dist/esm/3-candidate/types.d.ts

@@ -1 +0,0 @@
-export type { Seed } from '../internal/evaluateSeed.js';

package/dist/esm/3-candidate/types.js

@@ -1 +0,0 @@
-export {};