@sarj/eslint-plugin 9.1.0 → 9.3.0

package/dist/index.d.cts

@@ -392,7 +392,7 @@ type FlatPreset = {
 declare const plugin: {
     meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "9.1.0";
+        readonly version: "9.3.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.1.0";
+        readonly version: "9.3.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

@@ -493,7 +493,72 @@ function restatesStatementHead(body, statement) {
 // src/rules/no-comment-cruft.ts
 var LEADING_PREAMBLE_MIN = 4;
 var STEP_NARRATION_RE = /^(?:first(?:ly)?|second(?:ly)?|third(?:ly)?|then|next|after(?:wards| that)?|finally|lastly|now)\s*[,:]\s*\S/i;
-var META_COMMENTARY_RE = /\b(?:for now|keeping (?:it|this) simple|could be (?:refactored|improved|cleaned up|simplified)|refactor(?:ed|ing)? (?:later|this)|not sure (?:if|whether|why|how)|quick[- ](?:and[- ]dirty|fix)|(?:a |bit of a )?hacky|is a hack|temporary (?:solution|workaround|fix|hack)|revisit (?:this|later|below)|clean (?:this|it) up|not ideal|placeholder for now)\b/i;
+var META_COMMENTARY_RE = /\b(?:keeping (?:it|this) simple|could be (?:refactored|improved|cleaned up|simplified)|refactor(?:ed|ing)? (?:later|this)|not sure (?:if|whether|why|how)|quick[- ](?:and[- ]dirty|fix)|(?:a |bit of a )?hacky|is a hack|temporary (?:solution|workaround|fix|hack)|revisit (?:this|later|below)|clean (?:this|it) up|not ideal|placeholder for now)\b/i;
+var FOR_NOW_RE = /\bfor now\b/i;
+var DEFERRAL_STOPWORDS = /* @__PURE__ */ new Set([
+  "a",
+  "an",
+  "and",
+  "are",
+  "as",
+  "at",
+  "be",
+  "but",
+  "by",
+  "can",
+  "could",
+  "do",
+  "does",
+  "for",
+  "from",
+  "had",
+  "has",
+  "have",
+  "here",
+  "i",
+  "in",
+  "is",
+  "it",
+  "its",
+  "just",
+  "may",
+  "might",
+  "no",
+  "not",
+  "now",
+  "of",
+  "on",
+  "only",
+  "our",
+  "shall",
+  "should",
+  "so",
+  "still",
+  "that",
+  "the",
+  "then",
+  "there",
+  "this",
+  "to",
+  "us",
+  "was",
+  "we",
+  "were",
+  "will",
+  "with",
+  "would",
+  "you",
+  "your"
+]);
+var DEFERRAL_MAX_CONTENT_WORDS = 2;
+function isBareDeferral(text) {
+  if (!FOR_NOW_RE.test(text)) return false;
+  const rest = text.replace(FOR_NOW_RE, " ");
+  const content = (rest.match(/[A-Za-z][\w']*/g) ?? []).filter(
+    (word) => !DEFERRAL_STOPWORDS.has(word.toLowerCase())
+  );
+  return content.length <= DEFERRAL_MAX_CONTENT_WORDS;
+}
 var DIRECTIVE_RE = /^(eslint\b|eslint-|sarj-noqa\b|@ts-|prettier-ignore|prettier\b|biome-|c8\b|v8\b|istanbul\b|@type\b|@vite|webpack|<reference|<amd|global\b|noinspection|hack\b|xxx\b)/i;
 var LICENSE_RE = /copyright|licen[cs]ed?|spdx|permission is hereby granted|all rights reserved/i;
 var ENUMERATED_ITEM_RE = /^(?:\d+[.):]|[-*•])\s+\S/;
@@ -614,6 +679,7 @@ function isRedundantNarration(body, statementBelow, standalone, isolatedEnumerat
     const justified = JUSTIFICATION_RE.test(t);
     if (STEP_NARRATION_RE.test(t) && !justified) return true;
     if (META_COMMENTARY_RE.test(t) && !justified) return true;
+    if (isBareDeferral(t) && !justified) return true;
     if (HELPER_OPENER_RE.test(t) || LETS_RE.test(t)) return true;
     const words = t.split(/\s+/);
     if (words.length > 1 && words.length <= 4 && DUMMY_TRANSLATION_RE.test(t) && !/[():=]/.test(t)) {
@@ -1540,12 +1606,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 +1615,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 +1644,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 +3393,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 +3517,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 +6997,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 +7101,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 +8572,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 +8617,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 +8631,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 +8691,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 ?? [];
@@ -9348,7 +9350,7 @@ var rules = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "9.1.0"
+  version: "9.3.0"
 };
 var recommendedRules = {
   "@sarj/enforce-file-structure": "warn",