@cplieger/deadset-ts 7.2.0-dev.4 → 8.0.0-dev.10

package/dist/src/convention-rows.js

@@ -10,6 +10,8 @@ const SCRIPT = "{js,jsx,ts,tsx}";
 const MODULE = "{js,mjs,ts,mts}";
 const ANY_MODULE = "{js,mjs,cjs,ts,mts,cts}";
 const VITE_CONFIG = `vite.config.${ANY_MODULE}`;
+/** The legacy configuration files of ESLint: JSON, YAML or a CommonJS module. */
+const ESLINTRC = [".eslintrc", ".eslintrc.json", ".eslintrc.{yml,yaml}", ".eslintrc.{js,cjs}"];
 const SVELTEKIT_ROUTE_FILES = "+{page,layout,server,page.server,layout.server,error}";
 /** SvelteKit's entries other than its parameter matchers. */
 const SVELTEKIT_ENTRIES = [
@@ -59,6 +61,50 @@ const ANGULAR_PACKAGE_KEYS = [
     "styles",
     "scripts",
 ].map((key) => ({ key, files: ["angular.json"] }));
+/**
+ * The row of a code generator that writes its output below one directory its
+ * configuration's `property` sets, `fallback` where no configuration file sets it, so
+ * every file there is a generated file.
+ */
+function outputDirectoryRow(row) {
+    return {
+        name: row.name,
+        package: row.package,
+        range: row.range,
+        entries: [],
+        generated: ["<output>"],
+        moves: [
+            {
+                id: "output",
+                defaults: [row.fallback],
+                readings: [{ property: row.property, files: row.files }],
+            },
+        ],
+    };
+}
+/**
+ * The test runners and the assertion, mock and runner libraries whose import is test
+ * evidence beside each runner a row reads test files for. Each applies whether or not a
+ * manifest declares it, so none is a row.
+ */
+export const TEST_LIBRARIES = [
+    "@jest/globals",
+    "@playwright/test",
+    "ava",
+    "chai",
+    "expect",
+    "jasmine",
+    "jest",
+    "mocha",
+    "msw",
+    "nock",
+    "node:test",
+    "sinon",
+    "tap",
+    "uvu",
+];
+/** The scopes every package of which is a test library. */
+export const TEST_LIBRARY_SCOPES = ["@testing-library/"];
 /** Every row, ordered by name and then by range. */
 export const CONVENTION_ROWS = [
     {
@@ -79,6 +125,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "astro",
+        bundles: true,
         package: "astro",
         range: ">=5.0.0 <8.0.0",
         entries: [
@@ -111,6 +158,26 @@ export const CONVENTION_ROWS = [
             package: "@babel/runtime",
         })),
     },
+    {
+        name: "docusaurus",
+        package: "@docusaurus/core",
+        range: ">=2.0.0 <4.0.0",
+        entries: [`src/pages/**/*.${SCRIPT}`, `src/theme/**/*.${SCRIPT}`],
+        moves: [],
+    },
+    {
+        name: "eslint",
+        package: "eslint",
+        range: ">=4.0.0 <10.0.0",
+        entries: [],
+        moves: [],
+        packageKeys: [{ key: "parser", files: ESLINTRC }],
+        prefixedNames: [
+            { property: "plugins", files: ESLINTRC, prefix: "eslint-plugin" },
+            { property: "extends", files: ESLINTRC, prefix: "eslint-plugin", marker: "plugin:" },
+            { property: "extends", files: ESLINTRC, prefix: "eslint-config" },
+        ],
+    },
     {
         name: "eslint",
         package: "eslint",
@@ -118,15 +185,23 @@ export const CONVENTION_ROWS = [
         entries: [`**/eslint.config.${ANY_MODULE}`],
         moves: [],
     },
+    {
+        name: "expo",
+        package: "expo",
+        range: ">=44.0.0 <60.0.0",
+        entries: [`{index,App}.${SCRIPT}`],
+        moves: [],
+    },
     {
         name: "expo-router",
         package: "expo-router",
-        range: ">=3.0.0 <58.0.0",
+        range: ">=3.0.0 <59.0.0",
         entries: [`{,src/}app/**/*.${SCRIPT}`],
         moves: [],
     },
     {
         name: "next",
+        bundles: true,
         package: "next",
         range: ">=13.4.0 <17.0.0",
         generated: [".next"],
@@ -144,6 +219,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "nuxt",
+        bundles: true,
         package: "nuxt",
         range: ">=3.0.0 <5.0.0",
         generated: [".nuxt"],
@@ -202,6 +278,37 @@ export const CONVENTION_ROWS = [
             },
         ],
     },
+    {
+        name: "oclif",
+        package: "@oclif/core",
+        range: ">=1.0.0 <5.0.0",
+        entries: [`src/{commands,hooks}/**/*.${SCRIPT}`],
+        moves: [],
+        manifestEntries: [
+            { key: "oclif.commands", directory: true },
+            { key: "oclif.hooks", directory: false },
+        ],
+    },
+    outputDirectoryRow({
+        name: "panda",
+        package: "@pandacss/dev",
+        range: ">=0.1.0 <2.0.0",
+        files: [`panda.config.${ANY_MODULE}`],
+        property: "outdir",
+        fallback: "styled-system",
+    }),
+    {
+        name: "parcel",
+        bundles: true,
+        package: "parcel",
+        range: ">=2.0.0 <3.0.0",
+        entries: [],
+        moves: [],
+        manifestEntries: [
+            { key: "source", directory: false },
+            { key: "targets.*.source", directory: false },
+        ],
+    },
     {
         name: "prettier",
         package: "prettier",
@@ -258,6 +365,13 @@ export const CONVENTION_ROWS = [
             },
         ],
     },
+    {
+        name: "react-scripts",
+        package: "react-scripts",
+        range: ">=1.0.0 <6.0.0",
+        entries: [`src/index.${SCRIPT}`, "src/setupProxy.js", `src/setupTests.${SCRIPT}`],
+        moves: [],
+    },
     {
         name: "remix",
         package: "@remix-run/dev",
@@ -285,6 +399,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "rolldown",
+        bundles: true,
         package: "rolldown",
         range: ">=1.0.0 <2.0.0",
         entries: [],
@@ -330,6 +445,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "storybook",
+        bundles: true,
         package: "storybook",
         range: ">=7.0.0 <11.0.0",
         entries: [
@@ -363,6 +479,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "sveltekit",
+        bundles: true,
         package: "@sveltejs/kit",
         range: ">=2.0.0 <3.0.0",
         entries: [...SVELTEKIT_ENTRIES, "<params>/*.{js,ts}"],
@@ -428,6 +545,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "sveltekit",
+        bundles: true,
         package: "@sveltejs/kit",
         range: ">=3.0.0 <4.0.0",
         entries: [...SVELTEKIT_ENTRIES, "<params>.{js,ts}"],
@@ -493,8 +611,34 @@ export const CONVENTION_ROWS = [
             },
         ],
     },
+    {
+        name: "tanstack-router",
+        package: "@tanstack/router-plugin",
+        range: ">=1.0.0 <2.0.0",
+        entries: [`<routes>/**/*.${SCRIPT}`],
+        moves: [
+            {
+                id: "routes",
+                defaults: ["src/routes"],
+                readings: [
+                    { property: "routesDirectory", files: ["tsr.config.json"] },
+                    {
+                        property: "routesDirectory",
+                        files: [VITE_CONFIG],
+                        call: { module: "@tanstack/router-plugin/vite", export: "tanstackRouter" },
+                    },
+                    {
+                        property: "routesDirectory",
+                        files: [VITE_CONFIG],
+                        call: { module: "@tanstack/router-plugin/vite", export: "TanStackRouterVite" },
+                    },
+                ],
+            },
+        ],
+    },
     {
         name: "vite",
+        bundles: true,
         package: "vite",
         range: ">=8.0.0 <9.0.0",
         entries: [],
@@ -510,6 +654,7 @@ export const CONVENTION_ROWS = [
     },
     {
         name: "vitepress",
+        bundles: true,
         package: "vitepress",
         range: ">=1.0.0 <2.0.0-0 || >=2.0.0-alpha.0 <3.0.0",
         entries: [

package/dist/src/conventions.js

@@ -5,34 +5,30 @@
  * directory a configuration property moves read from the property's literal value.
  * No configuration file is run.
  */
-import { isArrayLiteralExpression, isAsExpression, isBinaryExpression, isCallExpression, isClassDeclaration, isComputedPropertyName, isExportAssignment, isExportDeclaration, isExpressionStatement, isFunctionDeclaration, isIdentifier, isImportDeclaration, isNamedExports, isNamespaceImport, isNoSubstitutionTemplateLiteral, isNonNullExpression, isNumericLiteral, isObjectBindingPattern, isObjectLiteralExpression, isParenthesizedExpression, isPropertyAccessExpression, isPropertyAssignment, isSatisfiesExpression, isShorthandPropertyAssignment, isSpreadAssignment, isStringLiteral, isVariableStatement, SyntaxKind, } from "@typescript/native/ast";
+import { isArrayLiteralExpression, isBinaryExpression, isCallExpression, isClassDeclaration, isComputedPropertyName, isExportAssignment, isExportDeclaration, isExpressionStatement, isFunctionDeclaration, isIdentifier, isImportDeclaration, isNamedExports, isNamespaceImport, isNoSubstitutionTemplateLiteral, isNumericLiteral, isObjectBindingPattern, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isShorthandPropertyAssignment, isSpreadAssignment, isStringLiteral, isVariableStatement, SyntaxKind, } from "@typescript/native/ast";
 import { lineOf } from "./component-files.js";
 import { CONVENTION_ROWS, } from "./convention-rows.js";
 import { documentStrings } from "./configuration-files.js";
-import { globExpression } from "./glob.js";
-import { dirnamePath, joinPath, normalizePath, relativePath, resolvePath } from "./paths.js";
+import { ancestors, dirnamePath, joinPath, normalizePath, relativePath, resolvePath, } from "./paths.js";
 import { satisfies } from "./version-range.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { unwrapped } from "./unwrap.js";
+import { filesIn } from "./fs/tree.js";
+import { DEPENDENCY_SECTIONS, INSTALLED_PACKAGES, MANIFEST, readJSON } from "./fs/manifest.js";
+import { globExpression } from "./text/glob.js";
+import { yamlDocument } from "./text/yaml.js";
 const JSON_EXTENSION = ".json";
+/**
+ * A configuration file its tool reads as a YAML document, read as the JSON document it
+ * denotes. Its nodes' offsets are that JSON text's, so no move may read one: a failure's
+ * line would name the wrong line.
+ */
+const YAML_NAME = /\.ya?ml$/u;
 /** A configuration file with no extension that its tool reads as a JSON document. */
 const JSON_RC = /^\.[\w-]+rc$/u;
 /** The sections an installed package is required by, so its absence fails the run. */
 const REQUIRED_SECTIONS = ["dependencies", "devDependencies"];
-const DEPENDENCY_SECTIONS = [
-    ...REQUIRED_SECTIONS,
-    "peerDependencies",
-    "optionalDependencies",
-];
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function readJSON(host, path) {
-    try {
-        return JSON.parse(host.readFile(path));
-    }
-    catch {
-        return undefined;
-    }
-}
 function declares(manifest, name, sections = DEPENDENCY_SECTIONS) {
     if (!isRecord(manifest)) {
         return false;
@@ -48,32 +44,15 @@ function declares(manifest, name, sections = DEPENDENCY_SECTIONS) {
  * none, or `undefined` where no `node_modules` holds it.
  */
 function installedVersion(host, dir, name) {
-    for (let at = normalizePath(dir);; at = dirnamePath(at)) {
-        const path = joinPath(at, "node_modules", name, "package.json");
+    for (const at of ancestors(dir)) {
+        const path = joinPath(at, INSTALLED_PACKAGES, name, MANIFEST);
         if (host.kindOf(path) === "file") {
             const manifest = readJSON(host, path);
             const version = isRecord(manifest) ? manifest["version"] : undefined;
             return typeof version === "string" ? version : "";
         }
-        if (dirnamePath(at) === at) {
-            return undefined;
-        }
     }
-}
-/** Whether one node wraps an expression without changing its value. */
-function isWrapper(node) {
-    return (isParenthesizedExpression(node) ||
-        isAsExpression(node) ||
-        isSatisfiesExpression(node) ||
-        isNonNullExpression(node));
-}
-/** The expression a wrapper that changes no value holds. */
-function unwrapped(node) {
-    let at = node;
-    while (isWrapper(at)) {
-        at = at.expression;
-    }
-    return at;
+    return undefined;
 }
 /** The key one property is written with, where it is written as a name or as literal text. */
 function keyOf(property) {
@@ -471,6 +450,40 @@ function manifestKeyUses(manifest, keys) {
     const strings = keys.flatMap((key) => documentStrings(manifest[key]));
     return declared.filter((name) => strings.some((text) => text === name || text.startsWith(`${name}/`)));
 }
+/** The extensions an entry a manifest entry key names without one may carry. */
+const ENTRY_EXTENSIONS = "{js,jsx,mjs,cjs,ts,tsx,mts,cts}";
+/** The characters that make a manifest string a pattern rather than a directory's name. */
+const PATTERN = /[*?{}[\]]/u;
+/**
+ * The entry globs one applied row's manifest entry keys write, below the manifest's
+ * directory: a directory's every module, or a file with or without an extension. A string
+ * that leaves the directory names nothing.
+ */
+function manifestEntryGlobs(manifest, keys) {
+    const at = (value, path) => {
+        const [key, ...rest] = path;
+        if (key === undefined) {
+            return [value];
+        }
+        if (!isRecord(value)) {
+            return [];
+        }
+        const next = key === "*" ? Object.values(value) : Object.hasOwn(value, key) ? [value[key]] : [];
+        return next.flatMap((one) => at(one, rest));
+    };
+    return keys.flatMap(({ key, directory }) => at(manifest, key.split(".")).flatMap((value) => documentStrings(value).flatMap((text) => {
+        const path = normalizePath(text)
+            .replace(/^(?:\.\/)+/u, "")
+            .replace(/\/+$/u, "");
+        if (path === "" || path === ".." || path.startsWith("../") || path.startsWith("/")) {
+            return [];
+        }
+        if (!directory) {
+            return [path, `${path}.${ENTRY_EXTENSIONS}`];
+        }
+        return PATTERN.test(path) ? [] : [`${path}/**/*.${ENTRY_EXTENSIONS}`];
+    })));
+}
 /**
  * Every value one file writes at one property's path inside the object it is read from:
  * the options argument of every call `call` names, or the file's default export. A string
@@ -528,17 +541,7 @@ function expand(template, resolved) {
 /** The configuration files in one directory that one glob names, by name. */
 function configurationFiles(host, dir, glob) {
     const expression = globExpression(glob);
-    let entries;
-    try {
-        entries = host.readDirectory(dir);
-    }
-    catch {
-        return [];
-    }
-    return entries
-        .filter((entry) => !entry.directory && expression.test(entry.name))
-        .map((entry) => entry.name)
-        .sort();
+    return filesIn(host, dir, (name) => expression.test(name));
 }
 function resolveMove(host, parse, dir, row, move, resolved) {
     const set = [];
@@ -580,6 +583,14 @@ function readingFiles(host, parse, dir, files) {
             catch {
                 continue;
             }
+            if (YAML_NAME.test(name)) {
+                const value = yamlDocument(text);
+                if (value !== undefined) {
+                    const json = JSON.stringify(value);
+                    found.push({ name, text: json, file: parse(`${path}${JSON_EXTENSION}`, json) });
+                }
+                continue;
+            }
             found.push({
                 name,
                 text,
@@ -618,7 +629,58 @@ function shortNameUses(host, parse, dir, manifest, readings) {
             }
         }
     }
-    return [...used].filter((name) => declared.has(name)).sort(compare);
+    return [...used].filter((name) => declared.has(name)).sort(bytewise);
+}
+/**
+ * The package one value of a prefixed-name reading names, or none: ESLint's own naming,
+ * https://github.com/eslint/eslintrc/blob/main/lib/shared/naming.js
+ */
+function prefixedPackage(value, reading) {
+    const { prefix, marker } = reading;
+    let name;
+    if (marker === undefined) {
+        if (value.includes(":") || value.startsWith(".") || value.startsWith("/")) {
+            return undefined;
+        }
+        const parts = value.split("/");
+        name = (value.startsWith("@") ? parts.slice(0, 2) : parts.slice(0, 1)).join("/");
+    }
+    else {
+        if (!value.startsWith(marker) || !value.includes("/", marker.length)) {
+            return undefined;
+        }
+        name = value.slice(marker.length, value.lastIndexOf("/"));
+    }
+    if (name === "") {
+        return undefined;
+    }
+    if (!name.startsWith("@")) {
+        return name.startsWith(`${prefix}-`) ? name : `${prefix}-${name}`;
+    }
+    const [scope, rest] = name.split("/");
+    if (rest === undefined || rest === "" || rest === prefix) {
+        return `${scope ?? name}/${prefix}`;
+    }
+    return rest.startsWith(`${prefix}-`) ? name : `${scope ?? name}/${prefix}-${rest}`;
+}
+/** The declared dependencies an applied row's prefixed names use. */
+function prefixedNameUses(host, parse, dir, manifest, readings) {
+    const declared = new Set(DEPENDENCY_SECTIONS.flatMap((section) => {
+        const held = isRecord(manifest) ? manifest[section] : undefined;
+        return isRecord(held) ? Object.keys(held) : [];
+    }));
+    const used = new Set();
+    for (const reading of readings) {
+        for (const { file } of readingFiles(host, parse, dir, reading.files)) {
+            for (const value of readProperty(file, reading.property, reading.call, true).values) {
+                const named = prefixedPackage(value, reading);
+                if (named !== undefined && declared.has(named)) {
+                    used.add(named);
+                }
+            }
+        }
+    }
+    return [...used].sort(bytewise);
 }
 /** The declared dependencies an applied row's helper settings use. */
 function helperUses(host, parse, dir, manifest, readings) {
@@ -675,13 +737,6 @@ function packageKeyUses(host, parse, dir, manifest, keys) {
         text.startsWith(`${name}/`) ||
         (text.startsWith(`${name}:`) && text.length > name.length + 1)));
 }
-/** Two strings ordered bytewise. */
-function compare(a, b) {
-    if (a === b) {
-        return 0;
-    }
-    return a < b ? -1 : 1;
-}
 /**
  * What the rows decide over the manifests the analysis reads. A row `disabled` names
  * is skipped before anything is read for it.
@@ -695,7 +750,7 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
     const selected = new Map();
     const testFiles = new Set();
     for (const manifest of manifests) {
-        const declared = readJSON(host, joinPath(manifest.dir, "package.json"));
+        const declared = readJSON(host, joinPath(manifest.dir, MANIFEST));
         const versions = new Map();
         const missing = new Set();
         for (const row of rows) {
@@ -716,7 +771,7 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
                 failures.push({
                     dir: manifest.dir,
                     failure: {
-                        setupClass: "missing-module",
+                        failureClass: "missing-module",
                         detail: `${manifest.path} declares ${row.package}, which no node_modules at or ` +
                             `above its directory holds: run the package manager's install`,
                     },
@@ -741,7 +796,7 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
                 failures.push({
                     dir: manifest.dir,
                     failure: {
-                        setupClass: "convention-not-literal",
+                        failureClass: "convention-not-literal",
                         detail: where === "." ? failed : `${where}/${failed}`,
                     },
                 });
@@ -756,6 +811,10 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
             for (const name of shortNameUses(host, parse, manifest.dir, declared, row.shortNames ?? [])) {
                 uses.add(name);
             }
+            const prefixed = row.prefixedNames ?? [];
+            for (const name of prefixedNameUses(host, parse, manifest.dir, declared, prefixed)) {
+                uses.add(name);
+            }
             const keys = row.packageKeys ?? [];
             for (const name of packageKeyUses(host, parse, manifest.dir, declared, keys)) {
                 uses.add(name);
@@ -774,7 +833,11 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
             for (const below of new Set((row.generated ?? []).flatMap((one) => expand(one, resolved)))) {
                 generated.push({ dir: manifest.dir, row: row.name, below });
             }
-            for (const glob of new Set(row.entries.flatMap((entry) => expand(entry, resolved)))) {
+            const written = [
+                ...row.entries.flatMap((entry) => expand(entry, resolved)),
+                ...manifestEntryGlobs(declared, row.manifestEntries ?? []),
+            ];
+            for (const glob of new Set(written)) {
                 globs.push({
                     dir: manifest.dir,
                     row: row.name,
@@ -785,15 +848,15 @@ export function readConventions(host, parse, manifests, disabled, rows = CONVENT
         }
     }
     const unique = [...new Map(applied.map((one) => [JSON.stringify(one), one])).values()];
-    unique.sort((a, b) => compare(a.name, b.name) ||
-        compare(a.manifest, b.manifest) ||
-        compare(JSON.stringify(a), JSON.stringify(b)));
+    unique.sort((a, b) => bytewise(a.name, b.name) ||
+        bytewise(a.manifest, b.manifest) ||
+        bytewise(JSON.stringify(a), JSON.stringify(b)));
     return {
         applied: unique,
         globs,
         generated,
         failures,
-        uses: [...uses].sort(compare),
+        uses: [...uses].sort(bytewise),
         selected,
         testFiles,
     };
@@ -819,10 +882,13 @@ export function conventionEntries(conventions, files) {
     const found = new Map();
     for (const glob of conventions.globs) {
         for (const file of files.byName.values()) {
-            const path = relativePath(glob.dir, file.fileName);
-            if (path !== undefined &&
-                glob.expression.test(path) &&
-                !glob.excludes.some((one) => one.test(path))) {
+            const matched = [file.fileName, ...files.writtenAs(file)].some((name) => {
+                const path = relativePath(glob.dir, name);
+                return (path !== undefined &&
+                    glob.expression.test(path) &&
+                    !glob.excludes.some((one) => one.test(path)));
+            });
+            if (matched) {
                 found.set(`${file.fileName}\u0000${glob.row}`, { file, row: glob.row });
             }
         }

package/dist/src/decorator.js

@@ -1,14 +1,10 @@
 /**
- * The decorator class: a member a decorator expression is attached to, and every
- * member of a class a decorator expression is attached to, is held back, because the
- * decorator receives the member or the class when the class is defined and may reach
- * the member by its name.
- *
- * The rule is read from the tree alone: a decorator is attached where it is written.
- * The use the decorator itself makes of what it decorates is the reference pass's,
- * which records it as a `decorator` reference; this class records only that the
- * declaration is held back, and the member set of a decorated class is every member
- * the inventory holds for the class, static members included.
+ * The decorator class: a member a decorator expression is attached to, and every member
+ * of a class one is attached to but the member a parameter property declares, is held
+ * back, because the decorator may reach the member by its name. The rule is read from
+ * the tree alone. The decorator's own use of what it decorates is the reference pass's
+ * `decorator` reference; this class records only that the declaration is held back,
+ * static members of a decorated class included.
  */
 import { decoratorsOf, spelledDecorator } from "./calls.js";
 import { isParameterProperty, nodeKey, } from "./inventory.js";
@@ -34,25 +30,32 @@ export function decorator(input) {
             }
         }
     }
-    const found = [];
+    const decorated = [];
+    // A decorated class's container passes each constructor argument, which keeps the
+    // parameter, not the member a parameter property stores it in.
+    const parameterMembers = new Set();
     for (const file of project.ownSourceFiles()) {
         const visit = (node) => {
             const id = held.declarations.get(nodeKey(file, node));
             const symbol = id === undefined ? undefined : byId.get(id);
+            if (id !== undefined && isParameterProperty(node)) {
+                parameterMembers.add(id);
+            }
             // A parameter property's decorator is attached to its parameter, and to no member.
             if (symbol !== undefined && DECORATED.has(symbol.kind) && !isParameterProperty(node)) {
                 for (const attached of decoratorsOf(node)) {
-                    const detail = `decorated by ${spelledDecorator(attached)}`;
-                    const site = renderPosition(file, targetRoot, attached.getStart());
-                    const reached = symbol.kind === "class" ? (membersOf.get(symbol.id) ?? []) : [symbol];
-                    for (const member of reached) {
-                        found.push({ id: member.id, detail, site });
-                    }
+                    decorated.push({
+                        symbol,
+                        detail: `decorated by ${spelledDecorator(attached)}`,
+                        site: renderPosition(file, targetRoot, attached.getStart()),
+                    });
                 }
             }
             node.forEachChild(visit);
         };
         file.forEachChild(visit);
     }
-    return found;
+    return decorated.flatMap(({ symbol, detail, site }) => (symbol.kind === "class"
+        ? (membersOf.get(symbol.id) ?? []).filter((member) => !parameterMembers.has(member.id))
+        : [symbol]).map((member) => ({ id: member.id, detail, site })));
 }