@sarj/eslint-plugin 9.0.0 → 9.1.0

package/dist/index.d.cts

@@ -392,7 +392,7 @@ type FlatPreset = {
 declare const plugin: {
     meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "9.0.0";
+        readonly version: "9.1.0";
     };
     rules: {
         "enforce-file-structure": _typescript_eslint_utils_ts_eslint.RuleModule<"importsFirst" | "useServerDirective", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {

package/dist/index.d.ts

@@ -392,7 +392,7 @@ type FlatPreset = {
 declare const plugin: {
     meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "9.0.0";
+        readonly version: "9.1.0";
     };
     rules: {
         "enforce-file-structure": _typescript_eslint_utils_ts_eslint.RuleModule<"importsFirst" | "useServerDirective", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {

package/dist/index.js

@@ -8729,26 +8729,111 @@ import { AST_NODE_TYPES as AST_NODE_TYPES41 } from "@typescript-eslint/utils";
 var CONFIGISH_TYPE_RE = /(?:Options|Opts|Config|Configuration|Settings|Params|Props|Args|Env|Environment|Callbacks|Flags)$/;
 var CONFIGISH_NAME_RE = /^(?:options|opts|config|configuration|settings|params|props|args|env|environment|callbacks|flags|logger|log|clock)$/i;
 var HTTP_TRANSPORT_TYPE_RE = /^(?:KyInstance|AxiosInstance|Session)$/;
+var BUILTIN_CONTAINER_TYPE_RE = /^(?:Record|Map|WeakMap|Set|WeakSet|Array|ReadonlyArray|ReadonlyMap|ReadonlySet|Promise|Partial|Required|Readonly|Pick|Omit|Exclude|Extract|NonNullable|Awaited|Parameters|ReturnType|InstanceType)$/;
 var TRANSPORT_WRAPPER_NAME_RE = /Client$/;
 var ROUTER_FACTORY_NAME = "Router";
 var FRAMEWORK_HTTP_TYPES = /* @__PURE__ */ new Set(["Request", "Response", "NextFunction"]);
 var isExportedClass = (node) => node.parent.type === AST_NODE_TYPES41.ExportNamedDeclaration || node.parent.type === AST_NODE_TYPES41.ExportDefaultDeclaration;
 var qualifiedName = (name) => name.type === AST_NODE_TYPES41.Identifier ? name.name : name.type === AST_NODE_TYPES41.TSQualifiedName ? `${qualifiedName(name.left)}.${name.right.name}` : "";
-var typeReferenceName = (annotated) => {
+var readTypeReference = (annotation) => {
+  if (annotation === void 0 || annotation.type !== AST_NODE_TYPES41.TSTypeReference) return null;
+  const { typeName } = annotation;
+  const rightmost = typeName.type === AST_NODE_TYPES41.Identifier ? typeName.name : typeName.type === AST_NODE_TYPES41.TSQualifiedName ? typeName.right.name : null;
+  if (rightmost === null) return null;
+  return { typeName: rightmost, display: qualifiedName(typeName) };
+};
+var namedParameterCollaborator = (annotated) => {
   let target = annotated;
   if (target.type === AST_NODE_TYPES41.TSParameterProperty) target = target.parameter;
   if (target.type === AST_NODE_TYPES41.AssignmentPattern) target = target.left;
   if (target.type !== AST_NODE_TYPES41.Identifier) return null;
-  const annotation = target.typeAnnotation?.typeAnnotation;
-  if (annotation === void 0 || annotation.type !== AST_NODE_TYPES41.TSTypeReference) {
+  const reference = readTypeReference(target.typeAnnotation?.typeAnnotation);
+  if (reference === null) return null;
+  return { name: target.name, ...reference };
+};
+var propertySignatureTypes = (members) => {
+  const types = /* @__PURE__ */ new Map();
+  for (const member of members) {
+    if (member.type !== AST_NODE_TYPES41.TSPropertySignature) continue;
+    if (member.computed || member.key.type !== AST_NODE_TYPES41.Identifier) continue;
+    const reference = readTypeReference(member.typeAnnotation?.typeAnnotation);
+    if (reference === null) continue;
+    types.set(member.key.name, reference);
+  }
+  return types;
+};
+var fileTypeIndex = (program) => {
+  const objects = /* @__PURE__ */ new Map();
+  const functionAliases = /* @__PURE__ */ new Set();
+  for (const statement of program.body) {
+    const declaration = statement.type === AST_NODE_TYPES41.ExportNamedDeclaration ? statement.declaration : statement;
+    if (declaration?.type === AST_NODE_TYPES41.TSInterfaceDeclaration) {
+      objects.set(declaration.id.name, propertySignatureTypes(declaration.body.body));
+      continue;
+    }
+    if (declaration?.type !== AST_NODE_TYPES41.TSTypeAliasDeclaration) continue;
+    const aliased = declaration.typeAnnotation;
+    if (aliased.type === AST_NODE_TYPES41.TSFunctionType || aliased.type === AST_NODE_TYPES41.TSConstructorType) {
+      functionAliases.add(declaration.id.name);
+      continue;
+    }
+    const literals = aliased.type === AST_NODE_TYPES41.TSTypeLiteral ? [aliased] : aliased.type === AST_NODE_TYPES41.TSIntersectionType ? aliased.types.filter((part) => part.type === AST_NODE_TYPES41.TSTypeLiteral) : [];
+    if (literals.length === 0) continue;
+    const merged = /* @__PURE__ */ new Map();
+    for (const literal of literals) {
+      for (const [name, reference] of propertySignatureTypes(literal.members)) {
+        merged.set(name, reference);
+      }
+    }
+    objects.set(declaration.id.name, merged);
+  }
+  return { objects, functionAliases };
+};
+var bagMemberTypes = (annotation, declared) => {
+  if (annotation.type === AST_NODE_TYPES41.TSTypeLiteral) {
+    return propertySignatureTypes(annotation.members);
+  }
+  if (annotation.type !== AST_NODE_TYPES41.TSTypeReference || annotation.typeName.type !== AST_NODE_TYPES41.Identifier) {
     return null;
   }
-  const { typeName } = annotation;
-  const rightmost = typeName.type === AST_NODE_TYPES41.Identifier ? typeName.name : typeName.type === AST_NODE_TYPES41.TSQualifiedName ? typeName.right.name : null;
-  if (rightmost === null) return null;
-  return { name: target.name, typeName: rightmost, display: qualifiedName(typeName) };
+  return declared().objects.get(annotation.typeName.name) ?? null;
 };
-var readConstructor = (ctor) => {
+var objectPatternCollaborators = (pattern, declared) => {
+  const annotation = pattern.typeAnnotation?.typeAnnotation;
+  if (annotation === void 0) return [];
+  const members = bagMemberTypes(annotation, declared);
+  if (members === null) return [];
+  const collaborators = [];
+  for (const property of pattern.properties) {
+    if (property.type !== AST_NODE_TYPES41.Property || property.computed) continue;
+    if (property.key.type !== AST_NODE_TYPES41.Identifier) continue;
+    const key = property.key.name;
+    const bound = property.value.type === AST_NODE_TYPES41.AssignmentPattern ? property.value.left : property.value;
+    if (bound.type !== AST_NODE_TYPES41.Identifier) continue;
+    if (CONFIGISH_NAME_RE.test(key)) continue;
+    const reference = members.get(key);
+    if (reference === void 0) continue;
+    collaborators.push({ name: bound.name, ...reference });
+  }
+  return collaborators;
+};
+var parameterCollaborators = (parameter, declared) => {
+  let target = parameter;
+  if (target.type === AST_NODE_TYPES41.AssignmentPattern) target = target.left;
+  if (target.type === AST_NODE_TYPES41.ObjectPattern) {
+    return objectPatternCollaborators(target, declared);
+  }
+  const named2 = namedParameterCollaborator(parameter);
+  return named2 === null ? [] : [named2];
+};
+var typeParameterNames = (...declarations) => {
+  const names = /* @__PURE__ */ new Set();
+  for (const declaration of declarations) {
+    for (const parameter of declaration?.params ?? []) names.add(parameter.name.name);
+  }
+  return names;
+};
+var readConstructor = (ctor, declared, typeParameters) => {
   const body = ctor.value.body;
   const storedFrom = /* @__PURE__ */ new Set();
   let constructedFields = 0;
@@ -8771,13 +8856,16 @@ var readConstructor = (ctor) => {
   }
   const collaborators = [];
   for (const parameter of ctor.value.params) {
-    const reference = typeReferenceName(parameter);
-    if (reference === null) continue;
-    const stored = parameter.type === AST_NODE_TYPES41.TSParameterProperty || storedFrom.has(reference.name);
-    if (!stored) continue;
-    if (CONFIGISH_TYPE_RE.test(reference.typeName)) continue;
-    if (CONFIGISH_NAME_RE.test(reference.name)) continue;
-    collaborators.push(reference);
+    for (const reference of parameterCollaborators(parameter, declared)) {
+      const stored = parameter.type === AST_NODE_TYPES41.TSParameterProperty || storedFrom.has(reference.name);
+      if (!stored) continue;
+      if (CONFIGISH_TYPE_RE.test(reference.typeName)) continue;
+      if (CONFIGISH_NAME_RE.test(reference.name)) continue;
+      if (typeParameters.has(reference.typeName)) continue;
+      if (BUILTIN_CONTAINER_TYPE_RE.test(reference.typeName)) continue;
+      if (declared().functionAliases.has(reference.typeName)) continue;
+      collaborators.push(reference);
+    }
   }
   return { collaborators, constructedFields };
 };
@@ -8859,6 +8947,8 @@ var require_interface_for_injected_service_default = createRule({
     const { filename } = context;
     if (isTestFile(filename) || isStoryFile(filename) || isScriptFile(filename)) return {};
     if (isGeneratedFile(filename, context.sourceCode.getText())) return {};
+    let declaredTypes = null;
+    const objectTypes = () => declaredTypes ??= fileTypeIndex(context.sourceCode.ast);
     return {
       ClassDeclaration(node) {
         if (node.id === null) return;
@@ -8871,7 +8961,11 @@ var require_interface_for_injected_service_default = createRule({
           (member) => member.type === AST_NODE_TYPES41.MethodDefinition && member.kind === "constructor"
         );
         if (ctor === void 0) return;
-        const { collaborators, constructedFields } = readConstructor(ctor);
+        const { collaborators, constructedFields } = readConstructor(
+          ctor,
+          objectTypes,
+          typeParameterNames(node.typeParameters, ctor.value.typeParameters)
+        );
         if (collaborators.length === 0) return;
         if (constructedFields > collaborators.length) return;
         if (isFrameworkWiring(node.body)) return;
@@ -9254,7 +9348,7 @@ var rules = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "9.0.0"
+  version: "9.1.0"
 };
 var recommendedRules = {
   "@sarj/enforce-file-structure": "warn",