@sarj/eslint-plugin 16.2.2 → 16.2.3

package/dist/index.cjs

@@ -356,7 +356,7 @@ var REQUIRE_EXPLICIT_CONTRACT_IMPLEMENTATION_DOCUMENTATION = {
   autofix: "none",
   limitations: [
     "Only class instances whose concrete class and selected constructor parameter resolve through the TypeScript checker are checked.",
-    "Object literals, casts, any, unresolved heritage, dynamic factories, and third-party classes are excluded."
+    "Object literals, casts, any, callback-valued data properties, unresolved heritage, dynamic factories, and third-party classes are excluded."
   ],
   examples: [
     {
@@ -415,14 +415,20 @@ var REQUIRE_EXPLICIT_CONTRACT_IMPLEMENTATION_DOCUMENTATION = {
     }
   ]
 };
-function isBehavioralContract(checker, type) {
-  if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return false;
+function behavioralContract(checker, type) {
+  if (type.isUnion()) {
+    const substantive = type.types.filter((member) => (member.flags & (ts.TypeFlags.Null | ts.TypeFlags.Undefined)) === 0);
+    if (substantive.length !== 1) return null;
+    return behavioralContract(checker, substantive[0]);
+  }
+  if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return null;
   const declaration = type.getSymbol()?.declarations?.find((item) => ts.isInterfaceDeclaration(item) || ts.isTypeAliasDeclaration(item) || ts.isClassDeclaration(item) && item.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword));
-  if (declaration === void 0) return false;
+  if (declaration === void 0) return null;
   return checker.getPropertiesOfType(type).some((property) => {
+    if (!property.declarations?.some((member) => ts.isMethodSignature(member) || ts.isMethodDeclaration(member))) return false;
     const propertyType = checker.getTypeOfSymbolAtLocation(property, declaration);
     return propertyType.getCallSignatures().length > 0;
-  });
+  }) ? type : null;
 }
 function ownedClass(type) {
   if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return null;
@@ -450,7 +456,7 @@ function explicitlyImplements(checker, declaration, target, seen) {
         unknown = true;
         continue;
       }
-      const relationship = explicitlyImplements(checker, inherited, target, seen);
+      const relationship = explicitlyImplements(checker, inherited, target, new Set(seen));
       if (relationship === true) return true;
       unknown ||= relationship === null;
     }
@@ -489,12 +495,13 @@ var require_explicit_contract_implementation_default = createRule({
         const parameter = parameters[index];
         if (parameter === void 0) continue;
         const parameterType = checker.getTypeOfSymbolAtLocation(parameter, tsNode);
-        if (!isBehavioralContract(checker, parameterType)) continue;
-        const contractSymbol = parameterType.getSymbol();
+        const contractType = behavioralContract(checker, parameterType);
+        if (contractType === null) continue;
+        const contractSymbol = contractType.getSymbol();
         if (contractSymbol === void 0) continue;
         const tsArgument = services.esTreeNodeToTSNodeMap.get(argument);
         const actualType = checker.getTypeAtLocation(tsArgument);
-        if (!checker.isTypeAssignableTo(actualType, parameterType)) continue;
+        if (!checker.isTypeAssignableTo(actualType, contractType)) continue;
         const implementation = ownedClass(actualType);
         if (implementation === null) continue;
         const relationship = explicitlyImplements(checker, implementation, contractSymbol, /* @__PURE__ */ new Set());
@@ -23801,7 +23808,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "16.2.2"
+  version: "16.2.3"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/dist/index.d.cts

@@ -922,7 +922,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "16.2.2";
+        readonly version: "16.2.3";
     };
     readonly rules: {
         readonly "require-explicit-contract-implementation": DocumentedRule<readonly [], "declareActualContract">;

package/dist/index.d.ts

@@ -922,7 +922,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "16.2.2";
+        readonly version: "16.2.3";
     };
     readonly rules: {
         readonly "require-explicit-contract-implementation": DocumentedRule<readonly [], "declareActualContract">;

package/dist/index.js

@@ -305,7 +305,7 @@ var REQUIRE_EXPLICIT_CONTRACT_IMPLEMENTATION_DOCUMENTATION = {
   autofix: "none",
   limitations: [
     "Only class instances whose concrete class and selected constructor parameter resolve through the TypeScript checker are checked.",
-    "Object literals, casts, any, unresolved heritage, dynamic factories, and third-party classes are excluded."
+    "Object literals, casts, any, callback-valued data properties, unresolved heritage, dynamic factories, and third-party classes are excluded."
   ],
   examples: [
     {
@@ -364,14 +364,20 @@ var REQUIRE_EXPLICIT_CONTRACT_IMPLEMENTATION_DOCUMENTATION = {
     }
   ]
 };
-function isBehavioralContract(checker, type) {
-  if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return false;
+function behavioralContract(checker, type) {
+  if (type.isUnion()) {
+    const substantive = type.types.filter((member) => (member.flags & (ts.TypeFlags.Null | ts.TypeFlags.Undefined)) === 0);
+    if (substantive.length !== 1) return null;
+    return behavioralContract(checker, substantive[0]);
+  }
+  if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return null;
   const declaration = type.getSymbol()?.declarations?.find((item) => ts.isInterfaceDeclaration(item) || ts.isTypeAliasDeclaration(item) || ts.isClassDeclaration(item) && item.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword));
-  if (declaration === void 0) return false;
+  if (declaration === void 0) return null;
   return checker.getPropertiesOfType(type).some((property) => {
+    if (!property.declarations?.some((member) => ts.isMethodSignature(member) || ts.isMethodDeclaration(member))) return false;
     const propertyType = checker.getTypeOfSymbolAtLocation(property, declaration);
     return propertyType.getCallSignatures().length > 0;
-  });
+  }) ? type : null;
 }
 function ownedClass(type) {
   if ((type.flags & (ts.TypeFlags.Any | ts.TypeFlags.Unknown)) !== 0) return null;
@@ -399,7 +405,7 @@ function explicitlyImplements(checker, declaration, target, seen) {
         unknown = true;
         continue;
       }
-      const relationship = explicitlyImplements(checker, inherited, target, seen);
+      const relationship = explicitlyImplements(checker, inherited, target, new Set(seen));
       if (relationship === true) return true;
       unknown ||= relationship === null;
     }
@@ -438,12 +444,13 @@ var require_explicit_contract_implementation_default = createRule({
         const parameter = parameters[index];
         if (parameter === void 0) continue;
         const parameterType = checker.getTypeOfSymbolAtLocation(parameter, tsNode);
-        if (!isBehavioralContract(checker, parameterType)) continue;
-        const contractSymbol = parameterType.getSymbol();
+        const contractType = behavioralContract(checker, parameterType);
+        if (contractType === null) continue;
+        const contractSymbol = contractType.getSymbol();
         if (contractSymbol === void 0) continue;
         const tsArgument = services.esTreeNodeToTSNodeMap.get(argument);
         const actualType = checker.getTypeAtLocation(tsArgument);
-        if (!checker.isTypeAssignableTo(actualType, parameterType)) continue;
+        if (!checker.isTypeAssignableTo(actualType, contractType)) continue;
         const implementation = ownedClass(actualType);
         if (implementation === null) continue;
         const relationship = explicitlyImplements(checker, implementation, contractSymbol, /* @__PURE__ */ new Set());
@@ -23822,7 +23829,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "16.2.2"
+  version: "16.2.3"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarj/eslint-plugin",
-  "version": "16.2.2",
+  "version": "16.2.3",
   "packageManager": "npm@12.1.0",
   "description": "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   "type": "module",