@yasainet/eslint 0.0.61 → 0.0.63

package/package.json

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

package/src/common/constants.mjs

@@ -23,10 +23,10 @@ const PROJECT_ROOT = findProjectRoot();
 /**
  * Files / basenames that should never become a prefix:
  *
- * - `types.ts`: 型定義のみで lib の役割を持たない
+ * - `types.ts` / `type.ts`: 型定義のみで lib の役割を持たない (単複どちらの命名でも除外)
  * - `proxy.ts`: middleware adapter (Next.js の proxy.ts と意味が衝突するため queries から呼ばせない)
  */
-const EXCLUDE_LIST = ["types.ts", "proxy.ts"];
+const EXCLUDE_LIST = ["types.ts", "type.ts", "proxy.ts"];
 
 /**
  * Scan lib directory and build prefix-to-lib-relative-path mapping:
@@ -34,7 +34,7 @@ const EXCLUDE_LIST = ["types.ts", "proxy.ts"];
  * - single-client lib (`lib/<dir>/index.ts`): prefix = dir 名、entry のみ登録 — 同 dir 内の他ファイル (parser 等 sub-module) は自動除外
  * - multi-client lib (index.ts なし): dir 内の全 `<role>.ts` を登録 (e.g., supabase の admin / server / client)
  * - 多重拡張子 (`.test.ts` 等) を持つファイルは sub-module / 非 lib として除外
- * - types.ts / proxy.ts のような lib として queries から呼ばせたくないものは EXCLUDE_LIST で除外
+ * - types.ts / type.ts / proxy.ts のような lib として queries から呼ばせたくないものは EXCLUDE_LIST で除外
  */
 export function generatePrefixLibMapping(featureRoot) {
   const libRoot = featureRoot.replace(/features$/, "lib");

package/src/common/imports.mjs

@@ -137,6 +137,19 @@ const ROUTE_BOUNDARY_PATTERNS = [
   },
 ];
 
+const SITEMAP_BOUNDARY_PATTERNS = [
+  {
+    group: ["**/queries/*", "**/queries"],
+    message:
+      "sitemap.ts can only import entries, not queries (sitemap-boundary violation)",
+  },
+  {
+    group: ["**/services/*", "**/services"],
+    message:
+      "sitemap.ts can only import entries, not services (sitemap-boundary violation)",
+  },
+];
+
 const HOOKS_BOUNDARY_PATTERNS = [
   {
     group: ["**/queries/*", "**/queries"],
@@ -220,6 +233,26 @@ export const routeBoundaryConfigs = [
   },
 ];
 
+/** Next.js-only: restrict sitemap.ts to only import entries. */
+export const sitemapBoundaryConfigs = [
+  {
+    name: "imports/sitemap-boundary",
+    files: ["src/app/sitemap.ts", "src/app/**/sitemap.ts"],
+    rules: {
+      "no-restricted-imports": [
+        "error",
+        {
+          patterns: [
+            ...SITEMAP_BOUNDARY_PATTERNS,
+            ...LIB_BOUNDARY_PATTERNS,
+            ...MAPPING_PATTERNS,
+          ],
+        },
+      ],
+    },
+  },
+];
+
 /** Next.js-only: restrict hooks to only import entries (not queries or services). */
 export const hooksBoundaryConfigs = [
   {
@@ -271,7 +304,6 @@ export const libBoundaryConfigs = [
     ignores: [
       "src/lib/**",
       "src/proxy.ts",
-      "src/app/sitemap.ts",
       "src/app/**/route.ts",
       "src/features/**",
     ],

package/src/common/local-plugins/feature-name.mjs

@@ -110,18 +110,16 @@ export const featureNameRule = {
     // Prefer the Supabase types file adjacent to `featureRoot` (e.g. `src/lib/...`
     // for `src/features`). Fall back to `src/lib/...` at the project root so that
     // non-`src` feature roots (e.g. `scripts/features`) can reuse the same
-    // generated types without duplicating the file.
-    const computedTypePath = path.join(
-      projectRoot,
-      featureRoot.replace(/features$/, "lib/supabase/types.ts"),
-    );
-    const fallbackTypePath = path.join(
-      projectRoot,
-      "src/lib/supabase/types.ts",
-    );
-    const supabaseTypePath = fs.existsSync(computedTypePath)
-      ? computedTypePath
-      : fallbackTypePath;
+    // generated types without duplicating the file. Both `types.ts` (plural) and
+    // `type.ts` (singular) are accepted to match either naming convention.
+    const candidateTypePaths = [
+      path.join(projectRoot, featureRoot.replace(/features$/, "lib/supabase/types.ts")),
+      path.join(projectRoot, featureRoot.replace(/features$/, "lib/supabase/type.ts")),
+      path.join(projectRoot, "src/lib/supabase/types.ts"),
+      path.join(projectRoot, "src/lib/supabase/type.ts"),
+    ];
+    const supabaseTypePath =
+      candidateTypePaths.find((p) => fs.existsSync(p)) ?? candidateTypePaths[0];
 
     const tableNames = extractTableNames(supabaseTypePath);
     const allowedNames = ["shared", "auth", ...tableNames.map(toKebab)];

package/src/next/index.mjs

@@ -6,6 +6,7 @@ import {
   libBoundaryConfigs,
   pageBoundaryConfigs,
   routeBoundaryConfigs,
+  sitemapBoundaryConfigs,
 } from "../common/imports.mjs";
 
 import { directivesConfigs } from "./directives.mjs";
@@ -29,6 +30,7 @@ export const eslintConfig = [
   ...libBoundaryConfigs,
   ...pageBoundaryConfigs,
   ...routeBoundaryConfigs,
+  ...sitemapBoundaryConfigs,
   ...hooksBoundaryConfigs,
   ...componentsBoundaryConfigs,
   ...namingConfigs,