@nielspeter/eess-ts 0.5.1 → 0.7.0

package/dist/models/arch-function.js

@@ -1,6 +1,7 @@
 import { ArchConfigError } from '@nielspeter/eess';
 import { Node as NodeClass, Scope, SyntaxKind, } from 'ts-morph';
 import { collectObjectLiteralFunctions } from '../core/object-literal-functions.js';
+import { throughWrappers } from '../core/through-wrappers.js';
 /**
  * Wrap a callable node as an `ArchFunction`, taking its name from the caller.
  *
@@ -24,7 +25,10 @@ export function fromCallableNode(node, getName) {
         getName,
         getSourceFile: () => node.getSourceFile(),
         isExported: () => false,
-        isAsync: () => node.isAsync(),
+        // An accessor cannot be `async`, and ts-morph gives it no `isAsync` to ask (bug 0321).
+        isAsync: () => NodeClass.isGetAccessorDeclaration(node) || NodeClass.isSetAccessorDeclaration(node)
+            ? false
+            : node.isAsync(),
         getParameters: () => node.getParameters(),
         getReturnType: () => node.getReturnType(),
         getBody: () => node.getBody(),
@@ -51,14 +55,14 @@ export function fromFunctionDeclaration(decl) {
     };
 }
 /**
- * Create an ArchFunction from a VariableDeclaration whose initializer
- * is an ArrowFunction.
+ * Create an ArchFunction from a VariableDeclaration whose initializer is a function — an arrow
+ * function or a function expression, directly or behind parentheses, `as`, `<T>`, `satisfies` or `!`
+ * (bug 0315).
  *
- * Precondition: caller must verify the initializer is an ArrowFunction.
+ * Precondition: caller must verify the initializer is one, with {@link functionValueOf}.
  */
 export function fromFunctionInitializerDeclaration(decl) {
-    const arrow = decl.getInitializerIfKind(SyntaxKind.ArrowFunction) ??
-        decl.getInitializerIfKind(SyntaxKind.FunctionExpression);
+    const arrow = functionValueOf(decl.getInitializer());
     if (!arrow)
         throw new ArchConfigError('fromFunctionInitializerDeclaration', 'Expected an arrow function or function expression initializer');
     return {
@@ -87,8 +91,8 @@ export function fromFunctionInitializerDeclaration(decl) {
  */
 export function fromMethodDeclaration(method) {
     const parent = method.getParent();
-    const className = NodeClass.isClassDeclaration(parent)
-        ? (parent.getName() ?? '<anonymous>')
+    const className = NodeClass.isClassDeclaration(parent) || NodeClass.isClassExpression(parent)
+        ? classNameOf(parent)
         : '<anonymous>';
     return {
         getName: () => {
@@ -110,23 +114,107 @@ export function fromMethodDeclaration(method) {
         getBody: () => method.getBody(),
         getNode: () => method,
         getStartLineNumber: () => method.getStartLineNumber(),
-        getScope: () => {
-            const scope = method.getScope();
-            if (scope === Scope.Protected)
-                return 'protected';
-            if (scope === Scope.Private)
-                return 'private';
-            return 'public';
-        },
+        getScope: () => accessOf(method.getScope()),
+    };
+}
+/** The kind of function an `ArchFunction` is, read off the node it reports at. */
+export function functionKindOf(fn) {
+    const node = fn.getNode();
+    if (NodeClass.isMethodDeclaration(node))
+        return 'method';
+    if (NodeClass.isConstructorDeclaration(node))
+        return 'constructor';
+    if (NodeClass.isGetAccessorDeclaration(node))
+        return 'getter';
+    if (NodeClass.isSetAccessorDeclaration(node))
+        return 'setter';
+    if (NodeClass.isPropertyDeclaration(node))
+        return 'property';
+    return 'function';
+}
+/** A member's access modifier as an `ArchFunction` reports it; no modifier is `'public'`. */
+function accessOf(scope) {
+    if (scope === Scope.Protected)
+        return 'protected';
+    if (scope === Scope.Private)
+        return 'private';
+    return 'public';
+}
+/**
+ * The function a node holds, read through the wrappers that leave it unchanged at run time —
+ * parentheses, `as`, `<T>`, `satisfies` and `!` — or `undefined` when it holds something else.
+ * A variable's initializer and a class property's value are read this way (bugs 0306, 0315).
+ */
+export function functionValueOf(node) {
+    const current = throughWrappers(node);
+    return NodeClass.isArrowFunction(current) || NodeClass.isFunctionExpression(current)
+        ? current
+        : undefined;
+}
+/**
+ * A class member that is a function but not a method, as an `ArchFunction` (bug 0315): the
+ * constructor, an accessor, or a property whose value is a function. Named by its class, as a method
+ * is; reported at the member, and read through `fn` — the member itself, or the property's function.
+ */
+function fromClassMember(cls, member, name, fn) {
+    const className = classNameOf(cls);
+    return {
+        getName: () => `${className}.${name}`,
+        getSourceFile: () => member.getSourceFile(),
+        isExported: () => (NodeClass.isClassDeclaration(cls) ? cls.isExported() : false),
+        isAsync: () => NodeClass.isArrowFunction(fn) || NodeClass.isFunctionExpression(fn) ? fn.isAsync() : false,
+        getParameters: () => fn.getParameters(),
+        getReturnType: () => fn.getReturnType(),
+        getBody: () => fn.getBody(),
+        getNode: () => member,
+        getStartLineNumber: () => member.getStartLineNumber(),
+        getScope: () => accessOf(member.getScope()),
     };
 }
+/**
+ * The class's function members other than its methods. The constructor with a body, as
+ * `Class.constructor` — ts-morph lists an overloaded constructor by its implementation alone, and an
+ * ambient class's constructor has no body. Each accessor as `Class.get x` or `Class.set x`: a
+ * getter and its setter share a name, and a metric's identity keys on the function's name. Each
+ * property whose value is a function, as `Class.handler`.
+ */
+/**
+ * The name a class's members are reported under: the class's own, else the binding that holds it —
+ * `const Expr = class { m() {} }` reports `Expr.m` — else `<anonymous>`, as a default-exported
+ * class's members have read since bug 0315.
+ */
+function classNameOf(cls) {
+    return cls.getName() ?? owningBindingName(cls) ?? '<anonymous>';
+}
+function classMemberFunctions(cls) {
+    const members = [];
+    for (const ctor of cls.getConstructors()) {
+        if (ctor.getBody() !== undefined)
+            members.push(fromClassMember(cls, ctor, 'constructor', ctor));
+    }
+    for (const getter of cls.getGetAccessors()) {
+        members.push(fromClassMember(cls, getter, `get ${getter.getName()}`, getter));
+    }
+    for (const setter of cls.getSetAccessors()) {
+        members.push(fromClassMember(cls, setter, `set ${setter.getName()}`, setter));
+    }
+    for (const property of cls.getProperties()) {
+        const value = functionValueOf(property.getInitializer());
+        if (value !== undefined)
+            members.push(fromClassMember(cls, property, property.getName(), value));
+    }
+    return members;
+}
 /**
  * Scan a source file for functions.
  *
  * Returns ArchFunction wrappers for these *named* shapes by default:
  * 1. FunctionDeclarations — `function foo() {}`
- * 2. VariableDeclarations with ArrowFunction initializer — `const foo = () => {}`
- * 3. Class MethodDeclarations — `class Foo { bar() {} }` (when includeMethods is true)
+ * 2. VariableDeclarations whose initializer is a function — `const foo = () => {}`, also behind
+ *    parentheses, `as`, `<T>`, `satisfies` or `!`
+ * 3. Class members, when includeMethods is true — methods (`Foo.bar`), the constructor
+ *    (`Foo.constructor`), accessors (`Foo.get x`, `Foo.set x`) and function-valued properties
+ *    (`Foo.handler`)
  *
  * Plus, when `includeObjectLiteralFunctions` is set (default off):
  * 4. Object-literal function property values (arrows / function expressions /
@@ -139,29 +227,29 @@ export function collectFunctions(sourceFile, options) {
     const includeMethods = options?.includeMethods ?? true;
     const includeObjectLiteralFunctions = options?.includeObjectLiteralFunctions ?? false;
     const functions = [];
-    // Pattern 1: FunctionDeclarations
-    for (const fn of sourceFile.getFunctions()) {
-        functions.push(fromFunctionDeclaration(fn));
-    }
-    // Pattern 2: const arrow functions
-    for (const varDecl of sourceFile.getVariableDeclarations()) {
-        // ArrowFunction and FunctionExpression both. `const a = function () {}` is
-        // an ordinary shape and was collected by nothing — bug 0224 measured `eval`
-        // passing the `recommended` floor inside one, because the element never
-        // reached the rule at all. (Distinct from the concise-arrow half of that
-        // bug, which was a traversal gap, not a collection gap.)
-        if (varDecl.getInitializerIfKind(SyntaxKind.ArrowFunction) ??
-            varDecl.getInitializerIfKind(SyntaxKind.FunctionExpression)) {
-            functions.push(fromFunctionInitializerDeclaration(varDecl));
-        }
-    }
-    // Pattern 3: class methods
-    if (includeMethods) {
-        for (const cls of sourceFile.getClasses()) {
-            for (const method of cls.getMethods()) {
-                functions.push(fromMethodDeclaration(method));
-            }
-        }
+    // Patterns 1 to 3 run over the file AND over every namespace body in it (bug 0321). A namespace
+    // is a scope that holds the same declarations a file does, and `getFunctions()`,
+    // `getVariableDeclarations()` and `getClasses()` answer only for the node they are asked. So
+    // `export namespace N { export function g() { eval('…') } }` — an ordinary function, in an
+    // ordinary place — reached no function rule at all, and the `recommended` floor with it.
+    //
+    // A namespace inside a FUNCTION is left out: everything in it is already part of that function's
+    // body, and collecting it again would report one `eval` twice.
+    collectFromScope(sourceFile, functions, includeMethods);
+    for (const namespace of namespaceScopes(sourceFile)) {
+        // Qualified by the namespace path — `N.Inner.m`, not `Inner.m`. Two namespaces in one file may
+        // hold a class of the same name, and an unqualified name would make the violation ambiguous,
+        // `.excluding()` hit both, and one accepted finding silently accept the other — bug 0010's
+        // collision, which the object-literal collection already prefixes against.
+        //
+        // The prefix does not remove every collision, and the new one is worth naming: in one file
+        // `class Expr { m() {} }`, `const Expr = class { m() {} }` and `namespace Expr { function m() {} }`
+        // all report as `Expr.m`. Name-based identity cannot tell them apart, here or on the
+        // object-literal path.
+        const prefix = namespacePathOf(namespace);
+        const collected = [];
+        collectFromScope(namespace, collected, includeMethods);
+        functions.push(...collected.map((fn) => qualifiedBy(prefix, fn)));
     }
     // Pattern 4: object-literal function property values (opt-in, proposal 016).
     // Collect from top-level object literals only; the shared traversal recurses
@@ -180,7 +268,7 @@ export function collectFunctions(sourceFile, options) {
             // findings collapsing to 2 identities). The documented example
             // (`routes["/x"].GET`) always implied this prefix; the code never added it.
             const owner = owningBindingName(root);
-            for (const found of collectObjectLiteralFunctions(root)) {
+            for (const found of collectObjectLiteralFunctions(root, { includeAccessors: true })) {
                 const keyPath = owner === undefined ? found.keyPath : [owner, ...found.keyPath];
                 const fn = fromObjectLiteralFunction(found.node, keyPath);
                 if (fn)
@@ -190,6 +278,98 @@ export function collectFunctions(sourceFile, options) {
     }
     return functions;
 }
+/**
+ * Every namespace body in a file that holds code and is not inside a function, innermost ones
+ * included — the scopes bug 0321 added beside the file itself.
+ *
+ * `ModuleDeclaration` is three declarations wearing one node kind: `namespace N {}`,
+ * `declare module 'virtual:mod' {}` and `declare global {}`. Only the first holds code. Taking all
+ * three collected subjects that DECLARE rather than run — `global.gf`, and `'virtual:mod'.mg`,
+ * whose element name carries a quote and a colon — and an adopter rule about function names
+ * reported them. An ambient `declare namespace` is the same: a description, not code.
+ */
+function namespaceScopes(sourceFile) {
+    if (sourceFile.isDeclarationFile())
+        return [];
+    return (sourceFile
+        .getDescendantsOfKind(SyntaxKind.ModuleDeclaration)
+        // AMBIENT is the whole test, and it is the only one that can fail. `declare global {}` and
+        // `declare module 'virtual:mod' {}` both carry the keyword, so both go; `namespace N {}` and the
+        // legacy `module N {}` both hold code, and both stay. Filtering by `ModuleDeclarationKind`
+        // instead dropped the legacy spelling — a false green measured while closing the ambient one —
+        // and the two extra filters that briefly guarded the other forms could not be made to fail, so
+        // they are not here.
+        .filter((namespace) => !namespace.hasDeclareKeyword())
+        .filter((namespace) => !isInsideAFunction(namespace)));
+}
+/** The dotted path of a namespace, outermost first: `N` for `N`, `A.B` for `namespace A { namespace B {} }`. */
+function namespacePathOf(namespace) {
+    const names = [];
+    for (const node of [namespace, ...namespace.getAncestors()]) {
+        if (NodeClass.isModuleDeclaration(node))
+            names.unshift(node.getName());
+    }
+    return names.join('.');
+}
+/** The same function, reported under a qualified name. */
+function qualifiedBy(prefix, fn) {
+    return {
+        ...fn,
+        getName: () => {
+            const name = fn.getName();
+            return name === undefined ? undefined : `${prefix}.${name}`;
+        },
+    };
+}
+/** Whether a node lies inside a function's body, where an enclosing function already reads it. */
+function isInsideAFunction(node) {
+    return node
+        .getAncestors()
+        .some((ancestor) => NodeClass.isFunctionDeclaration(ancestor) ||
+        NodeClass.isFunctionExpression(ancestor) ||
+        NodeClass.isArrowFunction(ancestor) ||
+        NodeClass.isMethodDeclaration(ancestor) ||
+        NodeClass.isConstructorDeclaration(ancestor) ||
+        NodeClass.isGetAccessorDeclaration(ancestor) ||
+        NodeClass.isSetAccessorDeclaration(ancestor));
+}
+/** Patterns 1 to 3 over one scope — a file, or a namespace body in it (bug 0321). */
+function collectFromScope(scope, functions, includeMethods) {
+    // Pattern 1: FunctionDeclarations
+    for (const fn of scope.getFunctions()) {
+        functions.push(fromFunctionDeclaration(fn));
+    }
+    // Pattern 2: const arrow functions
+    for (const varDecl of scope.getVariableDeclarations()) {
+        // ArrowFunction and FunctionExpression both. `const a = function () {}` is
+        // an ordinary shape and was collected by nothing — bug 0224 measured `eval`
+        // passing the `recommended` floor inside one, because the element never
+        // reached the rule at all. (Distinct from the concise-arrow half of that
+        // bug, which was a traversal gap, not a collection gap.)
+        // Read through parentheses, `as`, `<T>`, `satisfies` and `!` too: `const f = ((x) => …) as F` is
+        // the same function, and was collected by nothing (bug 0315).
+        if (functionValueOf(varDecl.getInitializer()) !== undefined) {
+            functions.push(fromFunctionInitializerDeclaration(varDecl));
+        }
+    }
+    // Pattern 3: class members — each class's methods, then its other function members, which no
+    // function rule read before bug 0315. A class EXPRESSION holds the same members as a
+    // declaration, so `const Expr = class { m() {…} }` is read too, its members named by the binding
+    // that holds it (bug 0321). One held by anything else — passed to a call, chosen by a
+    // conditional — stays out, with the inline functions bug 0315 left out on purpose.
+    if (includeMethods) {
+        const classExpressions = scope
+            .getVariableDeclarations()
+            .map((varDecl) => throughWrappers(varDecl.getInitializer()))
+            .filter((initializer) => NodeClass.isClassExpression(initializer));
+        for (const cls of [...scope.getClasses(), ...classExpressions]) {
+            for (const method of cls.getMethods()) {
+                functions.push(fromMethodDeclaration(method));
+            }
+            functions.push(...classMemberFunctions(cls));
+        }
+    }
+}
 /**
  * The name of the binding an object literal is assigned to, if any.
  *
@@ -233,7 +413,10 @@ export function fromObjectLiteralFunction(node, keyPath) {
     const name = qualifiedName(keyPath);
     if (NodeClass.isArrowFunction(node) ||
         NodeClass.isFunctionExpression(node) ||
-        NodeClass.isMethodDeclaration(node)) {
+        NodeClass.isMethodDeclaration(node) ||
+        // An object literal's accessors, the counterpart of the class accessors bug 0315 collected.
+        NodeClass.isGetAccessorDeclaration(node) ||
+        NodeClass.isSetAccessorDeclaration(node)) {
         return fromCallableNode(node, () => name);
     }
     return undefined;

package/dist/models/arch-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"arch-function.js","sourceRoot":"","sources":["../../src/models/arch-function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arch-function.js","sourceRoot":"","sources":["../../src/models/arch-function.ts"],"names":[],"mappings":"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"}

package/dist/predicates/class.d.ts

@@ -1,26 +1,26 @@
 import type { ClassDeclaration } from 'ts-morph';
 import type { Predicate } from '@nielspeter/eess';
 /**
- * Matches classes that extend the named base class.
- *
- * Uses the extends clause expression text, e.g. `class Foo extends Bar`
- * matches `extend('Bar')`.
+ * Matches classes whose direct base is the named class — written as its name, or through an
+ * aliased import, a namespace member or a mixin call. `class Foo extends Bar` matches
+ * `extend('Bar')`. A class that reaches `Bar` through an intermediate class is not matched.
  */
 export declare function extend(className: string): Predicate<ClassDeclaration>;
 /**
- * Matches classes that have an explicit `implements` clause for the named interface.
- *
- * Checks `getImplements()` expression texts.
+ * Matches classes whose own `implements` clause names the interface — as written, or through
+ * an aliased import.
  */
 export declare function implement(interfaceName: string): Predicate<ClassDeclaration>;
 /**
- * Matches classes that have a decorator with the given name.
+ * Matches classes that have a decorator with the given name — as written, or imported under
+ * an alias.
  *
  * @example haveDecorator('Controller') matches `@Controller class Foo {}`
  */
 export declare function haveDecorator(name: string): Predicate<ClassDeclaration>;
 /**
- * Matches classes that have a decorator whose name matches the regex.
+ * Matches classes that have a decorator whose name — as written, or the name an aliased
+ * import stands for — matches the regex.
  */
 export declare function haveDecoratorMatching(regex: RegExp): Predicate<ClassDeclaration>;
 /**

package/dist/predicates/class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../src/predicates/class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAM5E;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKvE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKhF;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAKzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKzE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAS7E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAK3E"}
+{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../src/predicates/class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAK5E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKvE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKhF;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,SAAS,CAAC,gBAAgB,CAAC,CAKzD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAKzE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAS7E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAK3E"}

package/dist/predicates/class.js

@@ -1,44 +1,45 @@
+import { decoratorNames, extendsByName, implementsByName } from '../helpers/heritage.js';
 /**
- * Matches classes that extend the named base class.
- *
- * Uses the extends clause expression text, e.g. `class Foo extends Bar`
- * matches `extend('Bar')`.
+ * Matches classes whose direct base is the named class — written as its name, or through an
+ * aliased import, a namespace member or a mixin call. `class Foo extends Bar` matches
+ * `extend('Bar')`. A class that reaches `Bar` through an intermediate class is not matched.
  */
 export function extend(className) {
     return {
         description: `extend "${className}"`,
-        test: (cls) => cls.getExtends()?.getExpression().getText() === className,
+        test: (cls) => extendsByName(cls, className),
     };
 }
 /**
- * Matches classes that have an explicit `implements` clause for the named interface.
- *
- * Checks `getImplements()` expression texts.
+ * Matches classes whose own `implements` clause names the interface — as written, or through
+ * an aliased import.
  */
 export function implement(interfaceName) {
     return {
         description: `implement "${interfaceName}"`,
-        test: (cls) => cls.getImplements().some((impl) => impl.getExpression().getText() === interfaceName),
+        test: (cls) => implementsByName(cls, interfaceName),
     };
 }
 /**
- * Matches classes that have a decorator with the given name.
+ * Matches classes that have a decorator with the given name — as written, or imported under
+ * an alias.
  *
  * @example haveDecorator('Controller') matches `@Controller class Foo {}`
  */
 export function haveDecorator(name) {
     return {
         description: `have decorator @${name}`,
-        test: (cls) => cls.getDecorators().some((d) => d.getName() === name),
+        test: (cls) => cls.getDecorators().some((d) => decoratorNames(d).includes(name)),
     };
 }
 /**
- * Matches classes that have a decorator whose name matches the regex.
+ * Matches classes that have a decorator whose name — as written, or the name an aliased
+ * import stands for — matches the regex.
  */
 export function haveDecoratorMatching(regex) {
     return {
         description: `have decorator matching ${String(regex)}`,
-        test: (cls) => cls.getDecorators().some((d) => regex.test(d.getName())),
+        test: (cls) => cls.getDecorators().some((d) => decoratorNames(d).some((n) => regex.test(n))),
     };
 }
 /**

package/dist/predicates/class.js.map

@@ -1 +1 @@
-{"version":3,"file":"class.js","sourceRoot":"","sources":["../../src/predicates/class.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,MAAM,CAAC,SAAiB;IACtC,OAAO;QACL,WAAW,EAAE,WAAW,SAAS,GAAG;QACpC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,SAAS;KACzE,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,aAAqB;IAC7C,OAAO;QACL,WAAW,EAAE,cAAc,aAAa,GAAG;QAC3C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,aAAa,CAAC;KACvF,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO;QACL,WAAW,EAAE,mBAAmB,IAAI,EAAE;QACtC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC;KACrE,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO;QACL,WAAW,EAAE,2BAA2B,MAAM,CAAC,KAAK,CAAC,EAAE;QACvD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACxE,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO;QACL,WAAW,EAAE,cAAc;QAC3B,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE;KAChC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO;QACL,WAAW,EAAE,sBAAsB,IAAI,GAAG;QAC1C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS;KACjD,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO;QACL,WAAW,EAAE,wBAAwB,MAAM,CAAC,KAAK,CAAC,EAAE;QACpD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC,CAAC;KACL,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO;QACL,WAAW,EAAE,wBAAwB,IAAI,GAAG;QAC5C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS;KACnD,CAAA;AACH,CAAC"}
+{"version":3,"file":"class.js","sourceRoot":"","sources":["../../src/predicates/class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAExF;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,SAAiB;IACtC,OAAO;QACL,WAAW,EAAE,WAAW,SAAS,GAAG;QACpC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC;KAC7C,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,aAAqB;IAC7C,OAAO;QACL,WAAW,EAAE,cAAc,aAAa,GAAG;QAC3C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC;KACpD,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO;QACL,WAAW,EAAE,mBAAmB,IAAI,EAAE;QACtC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACjF,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO;QACL,WAAW,EAAE,2BAA2B,MAAM,CAAC,KAAK,CAAC,EAAE;QACvD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7F,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO;QACL,WAAW,EAAE,cAAc;QAC3B,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE;KAChC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO;QACL,WAAW,EAAE,sBAAsB,IAAI,GAAG;QAC1C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS;KACjD,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO;QACL,WAAW,EAAE,wBAAwB,MAAM,CAAC,KAAK,CAAC,EAAE;QACpD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CACZ,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1B,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;YACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC,CAAC;KACL,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO;QACL,WAAW,EAAE,wBAAwB,IAAI,GAAG;QAC5C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS;KACnD,CAAA;AACH,CAAC"}

package/dist/predicates/function.d.ts

@@ -1,25 +1,37 @@
 import type { Predicate } from '@nielspeter/eess';
-import type { ArchFunction } from '../models/arch-function.js';
+import { type ArchFunction, type FunctionKind } from '../models/arch-function.js';
 import type { TypeMatcher } from '../helpers/type-matchers.js';
 /**
  * Matches functions/methods with public visibility.
  *
- * - Class methods: matches explicitly `public` or no access modifier (implicitly public).
+ * - Class members: matches explicitly `public` or no access modifier (implicitly public).
  * - Standalone functions / arrow functions: always match (module-level, no visibility concept).
  */
 export declare function arePublic(): Predicate<ArchFunction>;
 /**
- * Matches class methods with `protected` visibility.
+ * Matches class members with `protected` visibility.
  *
  * Standalone functions and arrow functions never match (they have no visibility modifier).
  */
 export declare function areProtected(): Predicate<ArchFunction>;
 /**
- * Matches class methods with `private` visibility.
+ * Matches class members with `private` visibility.
  *
  * Standalone functions and arrow functions never match (they have no visibility modifier).
  */
 export declare function arePrivate(): Predicate<ArchFunction>;
+/**
+ * Matches functions of any of the given kinds: `'function'`, `'method'`, `'constructor'`,
+ * `'getter'`, `'setter'` or `'property'` (see {@link FunctionKind}).
+ */
+export declare function areOfKind(...kinds: FunctionKind[]): Predicate<ArchFunction>;
+/**
+ * Matches functions of none of the given kinds. Since bug 0315 `functions()` collects a class's
+ * constructor and accessors beside its methods; a rule that requires something they cannot give —
+ * `beAsync()`, `contain(call(...))` — keeps to the functions that can with
+ * `areNotOfKind('constructor', 'getter', 'setter')`.
+ */
+export declare function areNotOfKind(...kinds: FunctionKind[]): Predicate<ArchFunction>;
 /**
  * Matches async functions (declared with the `async` keyword).
  */

package/dist/predicates/function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/predicates/function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAI9D;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,SAAS,CAAC,YAAY,CAAC,CAKnD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAAC,YAAY,CAAC,CAKtD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC,CAKpD;AAID;;GAEG;AACH,wBAAgB,QAAQ,IAAI,SAAS,CAAC,YAAY,CAAC,CAKlD;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,SAAS,CAAC,YAAY,CAAC,CAKrD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKrE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKhF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAK7E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKxE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAMhF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,CAAC,YAAY,CAAC,CAK3D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,SAAS,CAAC,YAAY,CAAC,CAK/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,CAUhG;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKlF"}
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/predicates/function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAkB,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAI9D;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,SAAS,CAAC,YAAY,CAAC,CAKnD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAAC,YAAY,CAAC,CAKtD;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC,CAKpD;AAuCD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,GAAG,KAAK,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,CAM3E;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,YAAY,CAAC,CAM9E;AAID;;GAEG;AACH,wBAAgB,QAAQ,IAAI,SAAS,CAAC,YAAY,CAAC,CAKlD;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,SAAS,CAAC,YAAY,CAAC,CAKrD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKrE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKhF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAK7E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKxE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAMhF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,CAAC,YAAY,CAAC,CAK3D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,SAAS,CAAC,YAAY,CAAC,CAK/D;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,CAUhG;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAKlF"}

package/dist/predicates/function.js

@@ -1,8 +1,10 @@
+import { ArchConfigError } from '@nielspeter/eess';
+import { functionKindOf } from '../models/arch-function.js';
 // --- Visibility predicates (plan 0032) ---
 /**
  * Matches functions/methods with public visibility.
  *
- * - Class methods: matches explicitly `public` or no access modifier (implicitly public).
+ * - Class members: matches explicitly `public` or no access modifier (implicitly public).
  * - Standalone functions / arrow functions: always match (module-level, no visibility concept).
  */
 export function arePublic() {
@@ -12,7 +14,7 @@ export function arePublic() {
     };
 }
 /**
- * Matches class methods with `protected` visibility.
+ * Matches class members with `protected` visibility.
  *
  * Standalone functions and arrow functions never match (they have no visibility modifier).
  */
@@ -23,7 +25,7 @@ export function areProtected() {
     };
 }
 /**
- * Matches class methods with `private` visibility.
+ * Matches class members with `private` visibility.
  *
  * Standalone functions and arrow functions never match (they have no visibility modifier).
  */
@@ -33,6 +35,57 @@ export function arePrivate() {
         test: (fn) => fn.getScope() === 'private',
     };
 }
+// --- Kind predicates (bug 0315) ---
+/** Every kind, checked by the compiler against `FunctionKind` so the two cannot drift apart. */
+const KINDS = {
+    function: true,
+    method: true,
+    constructor: true,
+    getter: true,
+    setter: true,
+    property: true,
+};
+const KNOWN_KINDS = new Set(Object.keys(KINDS));
+/**
+ * The kinds a kind predicate names. Naming none is refused, and so is a string that is not a kind: the
+ * `FunctionKind` type stops a typo only where the rule file is type-checked, and without this a rule
+ * file loaded unchecked would narrow the rule to the kinds it spelled right, and say nothing.
+ */
+function namedKinds(predicate, kinds) {
+    if (kinds.length === 0) {
+        throw new ArchConfigError(predicate, 'name at least one kind, e.g. constructor, getter or setter');
+    }
+    for (const kind of kinds) {
+        if (!KNOWN_KINDS.has(kind)) {
+            throw new ArchConfigError(predicate, `'${kind}' is not a function kind; the kinds are ${[...KNOWN_KINDS].join(', ')}`);
+        }
+    }
+    return new Set(kinds);
+}
+/**
+ * Matches functions of any of the given kinds: `'function'`, `'method'`, `'constructor'`,
+ * `'getter'`, `'setter'` or `'property'` (see {@link FunctionKind}).
+ */
+export function areOfKind(...kinds) {
+    const named = namedKinds('areOfKind', kinds);
+    return {
+        description: `are of kind ${kinds.join(', ')}`,
+        test: (fn) => named.has(functionKindOf(fn)),
+    };
+}
+/**
+ * Matches functions of none of the given kinds. Since bug 0315 `functions()` collects a class's
+ * constructor and accessors beside its methods; a rule that requires something they cannot give —
+ * `beAsync()`, `contain(call(...))` — keeps to the functions that can with
+ * `areNotOfKind('constructor', 'getter', 'setter')`.
+ */
+export function areNotOfKind(...kinds) {
+    const named = namedKinds('areNotOfKind', kinds);
+    return {
+        description: `are not of kind ${kinds.join(', ')}`,
+        test: (fn) => !named.has(functionKindOf(fn)),
+    };
+}
 // --- Async predicates ---
 /**
  * Matches async functions (declared with the `async` keyword).