@sarj/eslint-plugin 9.0.0 → 9.2.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.2.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.2.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

@@ -1540,12 +1540,6 @@ var no_dynamic_sql_default = createRule({
 
 // src/rules/no-enum.ts
 import "@typescript-eslint/utils";
-var DEFAULT_IGNORE_PATTERNS = [
-  /[\\/]generated[\\/]/,
-  /[\\/]openapi-gen[\\/]/,
-  /\.gen\.tsx?$/,
-  /\.generated\.tsx?$/
-];
 function matchesAnyPattern(filename, patterns) {
   for (const pattern of patterns) {
     const regexSource = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "::DOUBLESTAR::").replace(/\*/g, "[^/\\\\]*").replace(/::DOUBLESTAR::/g, ".*");
@@ -1555,10 +1549,6 @@ function matchesAnyPattern(filename, patterns) {
   }
   return false;
 }
-function hasGeneratedMarker(sourceText) {
-  const head = sourceText.slice(0, 1024);
-  return /@generated\b/.test(head);
-}
 var no_enum_default = createRule({
   name: "no-enum",
   meta: {
@@ -1588,12 +1578,8 @@ var no_enum_default = createRule({
     const ignoreFiles = options.ignoreFiles ?? [];
     const filename = context.filename;
     const sourceText = context.sourceCode.getText();
-    const isIgnoredByDefault = DEFAULT_IGNORE_PATTERNS.some(
-      (re) => re.test(filename)
-    );
     const isIgnoredByOption = ignoreFiles.length > 0 && matchesAnyPattern(filename, ignoreFiles);
-    const isGenerated = hasGeneratedMarker(sourceText) || isGeneratedFile(filename, sourceText);
-    if (isIgnoredByDefault || isIgnoredByOption || isGenerated) {
+    if (isIgnoredByOption || isGeneratedFile(filename, sourceText)) {
       return {};
     }
     return {
@@ -3341,35 +3327,6 @@ var no_restated_comment_default = createRule({
 
 // src/rules/no-restated-jsdoc.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES16 } from "@typescript-eslint/utils";
-var VALUE_TAGS = /* @__PURE__ */ new Set([
-  "alpha",
-  "author",
-  "beta",
-  "category",
-  "copyright",
-  "default",
-  "defaultvalue",
-  "deprecated",
-  "example",
-  "experimental",
-  "fileoverview",
-  "fixme",
-  "group",
-  "inheritdoc",
-  "internal",
-  "license",
-  "link",
-  "module",
-  "override",
-  "packagedocumentation",
-  "remarks",
-  "see",
-  "since",
-  "template",
-  "throws",
-  "todo",
-  "typeparam"
-]);
 var MODELLED_TAGS = /* @__PURE__ */ new Set([
   "arg",
   "argument",
@@ -3494,7 +3451,6 @@ var no_restated_jsdoc_default = createRule({
           const { description, tags } = parseJsDoc(comment.value);
           if (DIRECTIVE_RE3.test(description)) continue;
           const tagNames = new Set(tags.map((tag) => tag.name));
-          if ([...tagNames].some((name) => VALUE_TAGS.has(name))) continue;
           if ([...tagNames].some((name) => !MODELLED_TAGS.has(name))) continue;
           if (isProtected(description)) continue;
           const token = sourceCode.getTokenAfter(comment, { includeComments: false });
@@ -6975,25 +6931,32 @@ var STYLE_COLOR_PROPS = /* @__PURE__ */ new Set([
 var RAW_COLOR_VALUE_RE = new RegExp(`#[0-9a-fA-F]{3,8}\\b|\\b(?:${COLOR_FN})\\s*\\(`, "i");
 var CSS_VAR_REFERENCE_RE = /var\(\s*--/;
 var STORIES_FILE_RE = /\.stories\.[cm]?[jt]sx?$/i;
-var SEMANTIC_TOKEN_RE = /@theme\b|--(?:background|foreground|primary|secondary|muted|accent|destructive|border|card|popover)\b|(?:bg|text|border)-(?:background|foreground|primary|secondary|muted|accent|destructive|border|card|popover)\b/;
-var CONFIG_IS_SUFFICIENT = /* @__PURE__ */ new Set([
-  "components.json",
-  "tailwind.config.cjs",
-  "tailwind.config.js",
-  "tailwind.config.mjs",
-  "tailwind.config.ts"
-]);
-var DETECTION_FILES = [
+var TOKEN_ROLES = "background|foreground|primary|secondary|muted|accent|destructive|danger|success|warning|info|border|card|popover|surface|content|base|subtle|default|ring|input|fg|bg";
+var SEMANTIC_TOKEN_RE = new RegExp(
+  `--(?:color-)?(?:${TOKEN_ROLES})\\b|(?:bg|text|border|ring|fill|stroke)-(?:ui-)?(?:${TOKEN_ROLES})\\b`
+);
+var THEME_BLOCK_RE = /@theme\b/;
+var PRESENCE_MARKERS = [
   "components.json",
   "tailwind.config.js",
   "tailwind.config.cjs",
   "tailwind.config.mjs",
   "tailwind.config.ts",
+  "tailwind.config.mts",
+  "tailwind.config.cts"
+];
+var CSS_DETECTION_FILES = [
   "app/globals.css",
+  "app/global.css",
+  "app/styles/globals.css",
   "src/app/globals.css",
+  "src/app/global.css",
+  "src/global.css",
   "src/index.css",
   "src/styles/globals.css",
-  "styles/globals.css"
+  "src/styles/index.css",
+  "styles/globals.css",
+  "styles/index.css"
 ];
 var WORKSPACE_ROOT_FILES = [
   "pnpm-workspace.yaml",
@@ -7072,12 +7035,13 @@ var isInsideIconFactoryPath = (node) => {
   return false;
 };
 var hasMarkerAt = (dir) => {
-  for (const rel of DETECTION_FILES) {
+  if (PRESENCE_MARKERS.some((rel) => existsSync(join(dir, rel)))) return true;
+  for (const rel of CSS_DETECTION_FILES) {
     const candidate = join(dir, rel);
     if (!existsSync(candidate)) continue;
-    if (CONFIG_IS_SUFFICIENT.has(rel)) return true;
     try {
-      if (SEMANTIC_TOKEN_RE.test(readFileSync(candidate, "utf8"))) return true;
+      const css = readFileSync(candidate, "utf8");
+      if (SEMANTIC_TOKEN_RE.test(css) || THEME_BLOCK_RE.test(css)) return true;
     } catch {
     }
   }
@@ -8542,32 +8506,6 @@ var prefer_zod_infer_default = createRule({
 
 // src/rules/require-assert-never.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES39 } from "@typescript-eslint/utils";
-var isAssertNeverCall = (expression) => {
-  if (expression.type !== AST_NODE_TYPES39.CallExpression) return false;
-  const callee = expression.callee;
-  if (callee.type === AST_NODE_TYPES39.Identifier) {
-    return callee.name === "assertNever";
-  }
-  if (callee.type === AST_NODE_TYPES39.MemberExpression && !callee.computed && callee.property.type === AST_NODE_TYPES39.Identifier) {
-    return callee.property.name === "assertNever";
-  }
-  return false;
-};
-var statementContainsAssertNever = (statement) => {
-  if (statement.type === AST_NODE_TYPES39.ExpressionStatement) {
-    return isAssertNeverCall(statement.expression);
-  }
-  if (statement.type === AST_NODE_TYPES39.ThrowStatement) {
-    return isAssertNeverCall(statement.argument);
-  }
-  if (statement.type === AST_NODE_TYPES39.ReturnStatement) {
-    return statement.argument !== null && isAssertNeverCall(statement.argument);
-  }
-  if (statement.type === AST_NODE_TYPES39.BlockStatement) {
-    return statement.body.some(statementContainsAssertNever);
-  }
-  return false;
-};
 var isRuntimeHandlingStatement = (statement) => {
   if (statement.type === AST_NODE_TYPES39.EmptyStatement) return false;
   if (statement.type === AST_NODE_TYPES39.BlockStatement) {
@@ -8613,7 +8551,6 @@ var require_assert_never_default = createRule({
         if (defaultIndex === -1) return;
         const defaultCase = node.cases[defaultIndex];
         if (defaultCase === void 0) return;
-        if (defaultCase.consequent.some(statementContainsAssertNever)) return;
         if (defaultCase.consequent.some(isRuntimeHandlingStatement)) return;
         if (isFallthroughDefault(node, defaultIndex)) return;
         if (isCommentOnlyNoopDefault(defaultCase, context.sourceCode)) return;
@@ -8628,7 +8565,6 @@ var require_assert_never_default = createRule({
 
 // src/rules/require-fetch-timeout.ts
 import { AST_NODE_TYPES as AST_NODE_TYPES40, ASTUtils as ASTUtils2 } from "@typescript-eslint/utils";
-var CODEMOD_FIXTURE_RE = /[\\/]__testfixtures__[\\/]/;
 var GLOBAL_OBJECTS2 = /* @__PURE__ */ new Set([
   "globalThis",
   "window",
@@ -8689,7 +8625,7 @@ var require_fetch_timeout_default = createRule({
   },
   defaultOptions: [{}],
   create(context, [optionsArg]) {
-    if (isTestFile(context.filename) || isScriptFile(context.filename) || CODEMOD_FIXTURE_RE.test(context.filename)) {
+    if (isTestFile(context.filename) || isScriptFile(context.filename)) {
       return {};
     }
     const allowIn = optionsArg?.allowIn ?? [];
@@ -8729,26 +8665,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 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 readConstructor = (ctor) => {
+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 +8792,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 +8883,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 +8897,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 +9284,7 @@ var rules = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "9.0.0"
+  version: "9.2.0"
 };
 var recommendedRules = {
   "@sarj/enforce-file-structure": "warn",