@yasainet/eslint 0.0.52 → 0.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yasainet/eslint",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "ESLint",
   "type": "module",
   "exports": {

package/src/common/index.mjs

@@ -3,20 +3,30 @@ import { createImportsConfigs } from "./imports.mjs";
 import { createJsdocConfigs } from "./jsdoc.mjs";
 import { createLayersConfigs } from "./layers.mjs";
 import { createLibNamingConfigs, createNamingConfigs, createUtilsNamingConfigs } from "./naming.mjs";
-import { rulesConfigs } from "./rules.mjs";
+import { createRulesConfigs } from "./rules.mjs";
 
-/** Build common configs scoped to the given feature root. */
+/**
+ * Build common configs scoped to the given feature root:
+ *
+ * - `banAliasImports: true` enforces relative imports inside the feature root
+ * - `typeAware: false` disables type-aware rules and `local/no-any-return`,
+ *   for environments without a project tsconfig (e.g., Deno entry)
+ * - `rulesFiles` narrows the parser/rules block. Pass when combining multiple
+ *   entries so each entry only overrides its own files (e.g., the deno entry
+ *   passes `["supabase/functions/**\/*.ts"]` so it doesn't override next's
+ *   parser settings on `src/`).
+ */
 export function createCommonConfigs(
   featureRoot,
-  { banAliasImports = false } = {},
+  { banAliasImports = false, typeAware = true, rulesFiles } = {},
 ) {
   const prefixLibMapping = generatePrefixLibMapping(featureRoot);
   return [
-    ...rulesConfigs,
+    ...createRulesConfigs({ typeAware, ...(rulesFiles && { files: rulesFiles }) }),
     ...createNamingConfigs(featureRoot, prefixLibMapping),
     ...createLibNamingConfigs(featureRoot),
     ...createUtilsNamingConfigs(featureRoot),
-    ...createLayersConfigs(featureRoot),
+    ...createLayersConfigs(featureRoot, { typeAware }),
     ...createImportsConfigs(featureRoot, prefixLibMapping, { banAliasImports }),
     ...createJsdocConfigs(featureRoot),
   ];

package/src/common/layers.mjs

@@ -1,11 +1,30 @@
 import { localPlugin } from "./local-plugins/index.mjs";
 
-/** Scope layer rules to the given feature root. */
-export function createLayersConfigs(featureRoot) {
+/**
+ * Scope layer rules to the given feature root:
+ *
+ * - `typeAware: true` (default) includes `layers/no-any-return`, which uses
+ *   the TypeScript checker to inspect inferred return types
+ * - `typeAware: false` skips it for environments where the checker cannot run
+ *   (e.g., Deno files outside the project tsconfig)
+ */
+export function createLayersConfigs(featureRoot, { typeAware = true } = {}) {
   const loggerSelector = "CallExpression[callee.object.name='logger']";
   const loggerMessage =
     "logger is not allowed outside interactors. Logging belongs in interactors.";
 
+  const noAnyReturnConfig = {
+    name: "layers/no-any-return",
+    files: [
+      `${featureRoot}/**/queries/*.ts`,
+      `${featureRoot}/**/services/*.ts`,
+    ],
+    plugins: { local: localPlugin },
+    rules: {
+      "local/no-any-return": "error",
+    },
+  };
+
   return [
     // Logger/console: all features except interactors
     {
@@ -74,17 +93,7 @@ export function createLayersConfigs(featureRoot) {
     // Boundary type safety: queries & services must not leak `any`
     // into their public API. Uses type-aware inspection of the inferred
     // return type so unannotated functions are still checked.
-    {
-      name: "layers/no-any-return",
-      files: [
-        `${featureRoot}/**/queries/*.ts`,
-        `${featureRoot}/**/services/*.ts`,
-      ],
-      plugins: { local: localPlugin },
-      rules: {
-        "local/no-any-return": "error",
-      },
-    },
+    ...(typeAware ? [noAnyReturnConfig] : []),
     // Services: try-catch + logger + dead error fallbacks
     {
       name: "layers/services",

package/src/common/local-plugins/form-state-naming.mjs

@@ -0,0 +1,43 @@
+/**
+ * Enforce {Verb}{Subject}FormState pattern for FormState type names.
+ *
+ * Targets TSInterfaceDeclaration and TSTypeAliasDeclaration whose name ends
+ * with "FormState". Requires at least two PascalCase words before FormState
+ * (e.g. SignInFormState, CreateCommentFormState) so the verb prefix is never
+ * omitted. Single-noun names like "ContactFormState" are forbidden — rename
+ * to "CreateContactFormState" to make intent explicit.
+ */
+
+const FORM_STATE_ALLOW = /^[A-Z][a-z]+[A-Z]\w*FormState$/;
+
+function reportIfInvalid(context, idNode) {
+  const name = idNode.name;
+  if (!name.endsWith("FormState")) return;
+  if (FORM_STATE_ALLOW.test(name)) return;
+  context.report({
+    node: idNode,
+    messageId: "invalidName",
+    data: { name },
+  });
+}
+
+export const formStateNamingRule = {
+  meta: {
+    type: "problem",
+    messages: {
+      invalidName:
+        "FormState type '{{ name }}' must follow {Verb}{Subject}FormState pattern (e.g. CreateCommentFormState, SignInFormState). At least two PascalCase words are required.",
+    },
+    schema: [],
+  },
+  create(context) {
+    return {
+      TSInterfaceDeclaration(node) {
+        if (node.id) reportIfInvalid(context, node.id);
+      },
+      TSTypeAliasDeclaration(node) {
+        if (node.id) reportIfInvalid(context, node.id);
+      },
+    };
+  },
+};

package/src/common/local-plugins/index.mjs

@@ -1,18 +1,22 @@
 import { featureNameRule } from "./feature-name.mjs";
+import { formStateNamingRule } from "./form-state-naming.mjs";
 import { importPathStyleRule } from "./import-path-style.mjs";
 import { namespaceImportNameRule } from "./namespace-import-name.mjs";
 import { noAnyReturnRule } from "./no-any-return.mjs";
 import { queriesExportRule } from "./queries-export.mjs";
+import { queriesNamespaceImportRule } from "./queries-namespace-import.mjs";
 import { schemaNamingRule } from "./schema-naming.mjs";
 
 /** Single plugin object to avoid ESLint "Cannot redefine plugin" errors. */
 export const localPlugin = {
   rules: {
     "feature-name": featureNameRule,
+    "form-state-naming": formStateNamingRule,
     "import-path-style": importPathStyleRule,
     "namespace-import-name": namespaceImportNameRule,
     "no-any-return": noAnyReturnRule,
     "queries-export": queriesExportRule,
+    "queries-namespace-import": queriesNamespaceImportRule,
     "schema-naming": schemaNamingRule,
   },
 };

package/src/common/local-plugins/queries-namespace-import.mjs

@@ -0,0 +1,40 @@
+/**
+ * Enforce namespace imports for `queries/*.query.ts` files.
+ *
+ * Value imports must use `import * as xxxQuery from "..."` so that the
+ * `naming/namespace-import-name` rule can guarantee a single canonical
+ * binding (e.g. `comicsServerQuery.getComics`). Type-only imports are
+ * exempted because they have no runtime presence.
+ */
+
+const QUERIES_PATH = /\/queries\/[^/]+\.query$/;
+
+export const queriesNamespaceImportRule = {
+  meta: {
+    type: "problem",
+    messages: {
+      useNamespace:
+        'Use `import * as xxxQuery from "{{ source }}"` instead of named imports for queries layer. Type-only imports (`import type {}`) are allowed.',
+    },
+    schema: [],
+  },
+  create(context) {
+    return {
+      ImportDeclaration(node) {
+        if (typeof node.source.value !== "string") return;
+        if (!QUERIES_PATH.test(node.source.value)) return;
+        if (node.importKind === "type") return;
+
+        for (const specifier of node.specifiers) {
+          if (specifier.type !== "ImportSpecifier") continue;
+          if (specifier.importKind === "type") continue;
+          context.report({
+            node: specifier,
+            messageId: "useNamespace",
+            data: { source: node.source.value },
+          });
+        }
+      },
+    };
+  },
+};

package/src/common/naming.mjs

@@ -110,6 +110,22 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
         "local/queries-export": "error",
       },
     },
+    {
+      name: "naming/queries-namespace-import",
+      files: featuresGlob(featureRoot, "**/*.ts"),
+      plugins: { local: localPlugin },
+      rules: {
+        "local/queries-namespace-import": "error",
+      },
+    },
+    {
+      name: "naming/form-state",
+      files: featuresGlob(featureRoot, "**/*.ts"),
+      plugins: { local: localPlugin },
+      rules: {
+        "local/form-state-naming": "error",
+      },
+    },
   );
 
   configs.push(

package/src/common/rules.mjs

@@ -23,87 +23,116 @@ const findProjectRoot = (start) => {
 
 const projectRoot = findProjectRoot(import.meta.dirname);
 
-/** Base rule configs for code style and TypeScript checks. */
-export const rulesConfigs = [
-  {
-    name: "rules/shared",
-    plugins: {
-      "@stylistic": stylistic,
-      "simple-import-sort": simpleImportSortPlugin,
-    },
-    rules: {
-      "no-console": "warn",
-      "no-irregular-whitespace": [
-        "warn",
-        {
-          skipStrings: false,
-          skipComments: false,
-          skipRegExps: false,
-          skipTemplates: false,
-        },
-      ],
-      "simple-import-sort/imports": "warn",
-      "simple-import-sort/exports": "warn",
-      "@stylistic/quotes": ["warn", "double", { avoidEscape: true }],
-      // Dead code detection: rules with no legitimate use case, so always safe to error.
-      "no-unreachable": "error",
-      "no-unreachable-loop": "error",
-      "no-useless-return": "error",
-      "no-constant-condition": "error",
-      "no-constant-binary-expression": "error",
-      "no-dupe-else-if": "error",
-      "no-self-assign": "error",
-      "no-self-compare": "error",
-      "no-useless-catch": "error",
-      "no-fallthrough": "error",
-    },
+const sharedRulesConfig = {
+  name: "rules/shared",
+  plugins: {
+    "@stylistic": stylistic,
+    "simple-import-sort": simpleImportSortPlugin,
   },
-  {
-    name: "rules/typescript",
-    files: ["**/*.ts", "**/*.tsx"],
-    languageOptions: {
-      parser: tseslint.parser,
-      // Enable type-aware linting so rules like `no-unnecessary-condition`
-      // can consult the TypeScript type checker.
-      parserOptions: {
-        projectService: true,
-        tsconfigRootDir: projectRoot,
+  rules: {
+    "no-console": "warn",
+    "no-irregular-whitespace": [
+      "warn",
+      {
+        skipStrings: false,
+        skipComments: false,
+        skipRegExps: false,
+        skipTemplates: false,
       },
+    ],
+    "simple-import-sort/imports": "warn",
+    "simple-import-sort/exports": "warn",
+    "@stylistic/quotes": ["warn", "double", { avoidEscape: true }],
+    // Dead code detection: rules with no legitimate use case, so always safe to error.
+    "no-unreachable": "error",
+    "no-unreachable-loop": "error",
+    "no-useless-return": "error",
+    "no-constant-condition": "error",
+    "no-constant-binary-expression": "error",
+    "no-dupe-else-if": "error",
+    "no-self-assign": "error",
+    "no-self-compare": "error",
+    "no-useless-catch": "error",
+    "no-fallthrough": "error",
+  },
+};
+
+const syntacticTypeScriptRules = {
+  "@typescript-eslint/no-unused-vars": [
+    "error",
+    {
+      argsIgnorePattern: "^_",
+      varsIgnorePattern: "^_",
+      caughtErrorsIgnorePattern: "^_",
     },
-    plugins: {
-      "@typescript-eslint": tseslint.plugin,
-    },
-    rules: {
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_",
-          varsIgnorePattern: "^_",
-          caughtErrorsIgnorePattern: "^_",
-        },
-      ],
-      "@typescript-eslint/consistent-type-imports": [
-        "error",
-        { prefer: "type-imports" },
-      ],
-      "@typescript-eslint/no-explicit-any": "warn",
-      // Detect defensive fallbacks on non-nullable values (e.g., `?? ''`
-      // on a non-null column). Kept at warn until existing violations are
-      // cleaned up across consuming projects; promote to error afterwards.
-      "@typescript-eslint/no-unnecessary-condition": "warn",
-      // Type-aware async safety: silent await omissions are a leading cause
-      // of race conditions in server actions and background tasks.
-      "@typescript-eslint/no-floating-promises": "error",
-      "@typescript-eslint/no-misused-promises": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/require-await": "error",
-      // Type-aware `any` propagation checks: any が境界を越えた瞬間に
-      // 残りのコードで型検査が無効化されるため、検出したら確実に止める。
-      "@typescript-eslint/no-unsafe-assignment": "error",
-      "@typescript-eslint/no-unsafe-call": "error",
-      "@typescript-eslint/no-unsafe-member-access": "error",
-      "@typescript-eslint/no-unsafe-argument": "error",
-      "@typescript-eslint/no-unsafe-return": "error",
+  ],
+  "@typescript-eslint/consistent-type-imports": [
+    "error",
+    { prefer: "type-imports" },
+  ],
+  "@typescript-eslint/no-explicit-any": "warn",
+};
+
+const typeAwareTypeScriptRules = {
+  // Detect defensive fallbacks on non-nullable values (e.g., `?? ''`
+  // on a non-null column). Promoted to error once consuming projects
+  // (bitcomic.net, getpayme.net) reached 0 warnings.
+  "@typescript-eslint/no-unnecessary-condition": "error",
+  // Type-aware async safety: silent await omissions are a leading cause
+  // of race conditions in server actions and background tasks.
+  "@typescript-eslint/no-floating-promises": "error",
+  "@typescript-eslint/no-misused-promises": "error",
+  "@typescript-eslint/await-thenable": "error",
+  "@typescript-eslint/require-await": "error",
+  // Type-aware `any` propagation checks: any が境界を越えた瞬間に
+  // 残りのコードで型検査が無効化されるため、検出したら確実に止める。
+  "@typescript-eslint/no-unsafe-assignment": "error",
+  "@typescript-eslint/no-unsafe-call": "error",
+  "@typescript-eslint/no-unsafe-member-access": "error",
+  "@typescript-eslint/no-unsafe-argument": "error",
+  "@typescript-eslint/no-unsafe-return": "error",
+};
+
+const typeAwareRulesOff = Object.fromEntries(
+  Object.keys(typeAwareTypeScriptRules).map((rule) => [rule, "off"]),
+);
+
+/**
+ * Build base rule configs:
+ *
+ * - `typeAware: true` (default) enables `projectService` and type-aware rules
+ *   (`no-unnecessary-condition`, `no-floating-promises`, `no-unsafe-*`, etc.)
+ *   for the matched `files`
+ * - `typeAware: false` disables `projectService` and forces type-aware rules
+ *   off for the matched `files`. Use for files outside the project tsconfig
+ *   (e.g., Deno files in Supabase Edge Functions)
+ *
+ * `files` defaults to all TypeScript sources. When combining multiple entries
+ * (e.g., next + deno), pass a narrow pattern so the type-aware override only
+ * applies to its target files.
+ */
+export function createRulesConfigs({
+  typeAware = true,
+  files = ["**/*.ts", "**/*.tsx"],
+} = {}) {
+  return [
+    sharedRulesConfig,
+    {
+      name: "rules/typescript",
+      files,
+      languageOptions: {
+        parser: tseslint.parser,
+        parserOptions: typeAware
+          ? { projectService: true, tsconfigRootDir: projectRoot }
+          : { projectService: false, project: null },
+      },
+      plugins: {
+        "@typescript-eslint": tseslint.plugin,
+      },
+      rules: {
+        ...syntacticTypeScriptRules,
+        ...(typeAware ? typeAwareTypeScriptRules : typeAwareRulesOff),
+      },
     },
-  },
-];
+  ];
+}

package/src/deno/index.mjs

@@ -9,9 +9,21 @@ const denoEntryPointConfigs = createEntryPointConfigs(
   ["supabase/functions/_*/**"],
 );
 
+// Deno files are not covered by the consumer's project tsconfig
+// (Supabase functions live outside Next.js's tsconfig), so type-aware
+// rules cannot consult the type checker. Disable them here and rely on
+// `deno check` / `deno lint` for type-level guarantees.
+//
+// `rulesFiles` is narrowed so the override only affects Deno files. When this
+// entry is combined with `next`/`node`, those entries keep their type-aware
+// settings on their own files.
 /** Deno ESLint flat config entry point. */
 export const eslintConfig = [
-  ...createCommonConfigs(FEATURE_ROOT, { banAliasImports: true }),
+  ...createCommonConfigs(FEATURE_ROOT, {
+    banAliasImports: true,
+    typeAware: false,
+    rulesFiles: ["supabase/functions/**/*.ts"],
+  }),
   ...denoImportsConfigs,
   ...denoEntryPointConfigs,
 ];