@yasainet/eslint 0.0.60 → 0.0.62

package/README.md

@@ -25,7 +25,7 @@ Each entry point enforces a feature-based architecture. **Files do not carry rol
 ```text
 {featureRoot}/
 ├── {feature}/
-│   ├── interactors/    # entry points (server.ts / admin.ts / client.ts)
+│   ├── entries/        # entry points called from page.tsx / route.ts / hooks (server.ts / admin.ts / client.ts)
 │   ├── services/       # business logic (server.ts ...)
 │   ├── queries/        # data access (one file per upstream lib: <lib-name>.ts)
 │   ├── types/          # type defs (one file per feature: <feature>.ts)
@@ -53,7 +53,7 @@ For single-client libs the prefix mapping registers only the directory name, aut
 
 ### File naming rules
 
-- **No multi-extension suffixes** (`.lib`, `.service`, `.query`, `.util`, `.type`, `.schema`, `.constant`, `.interactor` are forbidden). The directory carries the role.
+- **No multi-extension suffixes** (`.lib`, `.service`, `.query`, `.util`, `.type`, `.schema`, `.constant`, `.entry` are forbidden). The directory carries the role.
 - `lib/<dir>/index.ts` for single-client lib entries (avoids `lib/<dir>/<dir>.ts` redundancy).
 - `lib/<dir>/types.ts` and `lib/<dir>/proxy.ts` are excluded from the prefix mapping so queries cannot directly depend on them.
 - `<feature>/{types,schemas,utils,constants}/<feature>.ts` — exactly one file per feature, named after the feature.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yasainet/eslint",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "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

@@ -5,8 +5,8 @@ const LAYER_PATTERNS = {
       message: "queries cannot import services (layer violation)",
     },
     {
-      group: ["**/interactors/*", "**/interactors"],
-      message: "queries cannot import interactors (layer violation)",
+      group: ["**/entries/*", "**/entries"],
+      message: "queries cannot import entries (layer violation)",
     },
     {
       group: ["**/hooks/*", "**/hooks"],
@@ -15,22 +15,22 @@ const LAYER_PATTERNS = {
   ],
   services: [
     {
-      group: ["**/interactors/*", "**/interactors"],
-      message: "services cannot import interactors (layer violation)",
+      group: ["**/entries/*", "**/entries"],
+      message: "services cannot import entries (layer violation)",
     },
     {
       group: ["**/hooks/*", "**/hooks"],
       message: "services cannot import hooks (layer violation)",
     },
   ],
-  interactors: [
+  entries: [
     {
       group: ["**/queries/*", "**/queries"],
-      message: "interactors cannot import queries (layer violation)",
+      message: "entries cannot import queries (layer violation)",
     },
     {
       group: ["**/hooks/*", "**/hooks"],
-      message: "interactors cannot import hooks (layer violation)",
+      message: "entries cannot import hooks (layer violation)",
     },
   ],
 };
@@ -50,11 +50,11 @@ const LATERAL_PATTERNS = {
         "services cannot import other feature's services (lateral violation)",
     },
   ],
-  interactors: [
+  entries: [
     {
-      group: ["@/features/*/interactors/*", "@/features/*/interactors"],
+      group: ["@/features/*/entries/*", "@/features/*/entries"],
       message:
-        "interactors cannot import other feature's interactors (lateral violation)",
+        "entries cannot import other feature's entries (lateral violation)",
     },
   ],
 };
@@ -64,21 +64,21 @@ const CARDINALITY_PATTERNS = {
     {
       group: ["**/services/client", "**/services/admin"],
       message:
-        "server interactor can only import server service (cardinality violation)",
+        "server entry can only import server service (cardinality violation)",
     },
   ],
   client: [
     {
       group: ["**/services/server", "**/services/admin"],
       message:
-        "client interactor can only import client service (cardinality violation)",
+        "client entry can only import client service (cardinality violation)",
     },
   ],
   admin: [
     {
       group: ["**/services/server", "**/services/client"],
       message:
-        "admin interactor can only import admin service (cardinality violation)",
+        "admin entry can only import admin service (cardinality violation)",
     },
   ],
 };
@@ -115,12 +115,12 @@ const PAGE_BOUNDARY_PATTERNS = [
   {
     group: ["**/queries/*", "**/queries"],
     message:
-      "page.tsx can only import interactors, not queries (page-boundary violation)",
+      "page.tsx can only import entries, not queries (page-boundary violation)",
   },
   {
     group: ["**/services/*", "**/services"],
     message:
-      "page.tsx can only import interactors, not services (page-boundary violation)",
+      "page.tsx can only import entries, not services (page-boundary violation)",
   },
 ];
 
@@ -128,12 +128,12 @@ const ROUTE_BOUNDARY_PATTERNS = [
   {
     group: ["**/queries/*", "**/queries"],
     message:
-      "route.ts can only import interactors, not queries (route-boundary violation)",
+      "route.ts can only import entries, not queries (route-boundary violation)",
   },
   {
     group: ["**/services/*", "**/services"],
     message:
-      "route.ts can only import interactors, not services (route-boundary violation)",
+      "route.ts can only import entries, not services (route-boundary violation)",
   },
 ];
 
@@ -141,12 +141,12 @@ const HOOKS_BOUNDARY_PATTERNS = [
   {
     group: ["**/queries/*", "**/queries"],
     message:
-      "hooks can only import interactors, not queries (hooks-boundary violation)",
+      "hooks can only import entries, not queries (hooks-boundary violation)",
   },
   {
     group: ["**/services/*", "**/services"],
     message:
-      "hooks can only import interactors, not services (hooks-boundary violation)",
+      "hooks can only import entries, not services (hooks-boundary violation)",
   },
 ];
 
@@ -154,12 +154,12 @@ const COMPONENTS_BOUNDARY_PATTERNS = [
   {
     group: ["**/queries/*", "**/queries"],
     message:
-      "components can only import interactors or hooks, not queries (components-boundary violation)",
+      "components can only import entries or hooks, not queries (components-boundary violation)",
   },
   {
     group: ["**/services/*", "**/services"],
     message:
-      "components can only import interactors or hooks, not services (components-boundary violation)",
+      "components can only import entries or hooks, not services (components-boundary violation)",
   },
 ];
 
@@ -180,7 +180,7 @@ function makeConfig(name, files, ...patternArrays) {
 // ones — patterns are not merged. Page / hooks / components boundary configs
 // run after libBoundaryConfigs and would silently drop lib + mapping bans
 // unless we re-include those patterns explicitly.
-/** Next.js-only: restrict page.tsx to only import interactors. */
+/** Next.js-only: restrict page.tsx to only import entries. */
 export const pageBoundaryConfigs = [
   {
     name: "imports/page-boundary",
@@ -200,7 +200,7 @@ export const pageBoundaryConfigs = [
   },
 ];
 
-/** Next.js-only: restrict route.ts to only import interactors. */
+/** Next.js-only: restrict route.ts to only import entries. */
 export const routeBoundaryConfigs = [
   {
     name: "imports/route-boundary",
@@ -220,7 +220,7 @@ export const routeBoundaryConfigs = [
   },
 ];
 
-/** Next.js-only: restrict hooks to only import interactors (not queries or services). */
+/** Next.js-only: restrict hooks to only import entries (not queries or services). */
 export const hooksBoundaryConfigs = [
   {
     name: "imports/hooks-boundary",
@@ -240,7 +240,7 @@ export const hooksBoundaryConfigs = [
   },
 ];
 
-/** Next.js-only: restrict components to only import interactors or hooks (not queries or services). */
+/** Next.js-only: restrict components to only import entries or hooks (not queries or services). */
 export const componentsBoundaryConfigs = [
   {
     name: "imports/components-boundary",
@@ -350,10 +350,10 @@ export function createImportsConfigs(
 
   configs.push(
     makeConfig(
-      "interactors",
-      [`${featureRoot}/**/interactors/*.ts`],
-      LAYER_PATTERNS.interactors,
-      LATERAL_PATTERNS.interactors,
+      "entries",
+      [`${featureRoot}/**/entries/*.ts`],
+      LAYER_PATTERNS.entries,
+      LATERAL_PATTERNS.entries,
       LIB_BOUNDARY_PATTERNS,
       MAPPING_PATTERNS,
     ),
@@ -376,7 +376,7 @@ export function createImportsConfigs(
     ignores: [
       `${featureRoot}/**/services/*.ts`,
       `${featureRoot}/**/queries/*.ts`,
-      `${featureRoot}/**/interactors/*.ts`,
+      `${featureRoot}/**/entries/*.ts`,
       `${featureRoot}/**/utils/*.ts`,
       `${featureRoot}/**/types/*.ts`,
     ],
@@ -400,10 +400,10 @@ export function createImportsConfigs(
   for (const prefix of ["server", "client", "admin"]) {
     configs.push(
       makeConfig(
-        `interactors/${prefix}`,
-        [`${featureRoot}/**/interactors/${prefix}.ts`],
-        LAYER_PATTERNS.interactors,
-        LATERAL_PATTERNS.interactors,
+        `entries/${prefix}`,
+        [`${featureRoot}/**/entries/${prefix}.ts`],
+        LAYER_PATTERNS.entries,
+        LATERAL_PATTERNS.entries,
         CARDINALITY_PATTERNS[prefix],
         LIB_BOUNDARY_PATTERNS,
         MAPPING_PATTERNS,

package/src/common/layers.mjs

@@ -11,7 +11,7 @@ import { localPlugin } from "./local-plugins/index.mjs";
 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.";
+    "logger is not allowed outside entries. Logging belongs in entries.";
 
   const noAnyReturnConfig = {
     name: "layers/no-any-return",
@@ -26,11 +26,11 @@ export function createLayersConfigs(featureRoot, { typeAware = true } = {}) {
   };
 
   return [
-    // Logger/console: all features except interactors
+    // Logger/console: all features except entries
     {
       name: "layers/logger",
       files: [`${featureRoot}/**/*.ts`],
-      ignores: [`${featureRoot}/**/interactors/*.ts`],
+      ignores: [`${featureRoot}/**/entries/*.ts`],
       rules: {
         "no-console": "error",
         "no-restricted-syntax": [
@@ -49,7 +49,7 @@ export function createLayersConfigs(featureRoot, { typeAware = true } = {}) {
           {
             selector: "TryStatement",
             message:
-              "try-catch is not allowed in queries. Error handling belongs in interactors.",
+              "try-catch is not allowed in queries. Error handling belongs in entries.",
           },
           {
             selector: "IfStatement",
@@ -84,7 +84,7 @@ export function createLayersConfigs(featureRoot, { typeAware = true } = {}) {
           {
             selector: "ThrowStatement",
             message:
-              "throw is not allowed in queries. Queries must return Supabase's { data, error } shape as-is. Error handling belongs in interactors.",
+              "throw is not allowed in queries. Queries must return Supabase's { data, error } shape as-is. Error handling belongs in entries.",
           },
           { selector: loggerSelector, message: loggerMessage },
         ],
@@ -104,20 +104,20 @@ export function createLayersConfigs(featureRoot, { typeAware = true } = {}) {
           {
             selector: "TryStatement",
             message:
-              "try-catch is not allowed in services. Error handling belongs in interactors.",
+              "try-catch is not allowed in services. Error handling belongs in entries.",
           },
           { selector: loggerSelector, message: loggerMessage },
           {
             selector:
               "LogicalExpression[operator='??'][left.type='ChainExpression'][left.expression.property.name='message'][right.type='Literal']",
             message:
-              "Dead fallback for error message. If you reached this branch the error is known — return the error directly. Unhandled exceptions belong in interactors.",
+              "Dead fallback for error message. If you reached this branch the error is known — return the error directly. Unhandled exceptions belong in entries.",
           },
           {
             selector:
               "LogicalExpression[operator='??'][left.type='MemberExpression'][left.property.name='error'][right.type='ObjectExpression']",
             message:
-              "Dead fallback for nullable error. Check `if (error)` and return the error directly. Unhandled exceptions belong in interactors.",
+              "Dead fallback for nullable error. Check `if (error)` and return the error directly. Unhandled exceptions belong in entries.",
           },
         ],
       },

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/common/local-plugins/namespace-import-name.mjs

@@ -12,7 +12,7 @@ const LAYER_DIR_MAP = {
   queries: "Query",
   services: "Service",
   domains: "Domain",
-  interactors: "Interactor",
+  entries: "Entry",
   utils: "Util",
   types: "Type",
   schemas: "Schema",

package/src/common/naming.mjs

@@ -52,9 +52,9 @@ export function createUtilsNamingConfigs(featureRoot) {
 /**
  * Scope naming rules to the given feature root:
  *
- * - 全 layer (services / queries / interactors / utils / types / schemas / constants) で suffix を廃止
+ * - 全 layer (services / queries / entries / utils / types / schemas / constants) で suffix を廃止
  * - ファイル名 (basename) は単一トークン (`*` パターン) を強制し、role はディレクトリで宣言する
- * - queries / services / interactors のファイル名は prefixLibMapping のキー (lib name) と一致させ、どの lib を呼ぶか明示する
+ * - queries / services / entries のファイル名は prefixLibMapping のキー (lib name) と一致させ、どの lib を呼ぶか明示する
  * - shared/ 配下では feature 名でなく `shared` または lib name を allowed prefix として許可する
  */
 export function createNamingConfigs(featureRoot, prefixLibMapping) {
@@ -284,9 +284,9 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
   );
 
   configs.push({
-    name: "naming/interactors",
-    files: featuresGlob(featureRoot, "**/interactors/*.ts"),
-    ignores: featuresGlob(featureRoot, "shared/interactors/*.ts"),
+    name: "naming/entries",
+    files: featuresGlob(featureRoot, "**/entries/*.ts"),
+    ignores: featuresGlob(featureRoot, "shared/entries/*.ts"),
     plugins: { "check-file": checkFile },
     rules: {
       "check-file/filename-naming-convention": [
@@ -298,8 +298,8 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
 
   configs.push(
     {
-      name: "naming/interactors-shared",
-      files: featuresGlob(featureRoot, "shared/interactors/*.ts"),
+      name: "naming/entries-shared",
+      files: featuresGlob(featureRoot, "shared/entries/*.ts"),
       plugins: { "check-file": checkFile },
       rules: {
         "check-file/filename-naming-convention": [

package/src/deno/imports.mjs

@@ -40,17 +40,17 @@ export const denoImportsConfigs = [
             {
               group: ["**/services/*", "**/services"],
               message:
-                "Entry points must not import services directly. Import from interactors instead.",
+                "Top-level files must not import services directly. Import from entries instead.",
             },
             {
               group: ["**/queries/*", "**/queries"],
               message:
-                "Entry points must not import queries directly. Import from interactors instead.",
+                "Top-level files must not import queries directly. Import from entries instead.",
             },
             {
               group: ["*/_lib/*", "*/_lib/**"],
               message:
-                "Entry points must not import _lib/ directly. Import from interactors instead.",
+                "Top-level files must not import _lib/ directly. Import from entries instead.",
             },
           ],
         },

package/src/next/directives.mjs

@@ -1,8 +1,8 @@
 /** Enforce "use server" / "use client" directives per file convention. */
 export const directivesConfigs = [
   {
-    name: "directives/server-interactor",
-    files: ["src/features/**/interactors/server.ts"],
+    name: "directives/server-entry",
+    files: ["src/features/**/entries/server.ts"],
     rules: {
       "no-restricted-syntax": [
         "error",
@@ -10,14 +10,14 @@ export const directivesConfigs = [
           selector:
             "Program > :first-child:not(ExpressionStatement[expression.value='use server'])",
           message:
-            'interactors/server.ts must start with "use server" directive.',
+            'entries/server.ts must start with "use server" directive.',
         },
       ],
     },
   },
   {
-    name: "directives/admin-interactor",
-    files: ["src/features/**/interactors/admin.ts"],
+    name: "directives/admin-entry",
+    files: ["src/features/**/entries/admin.ts"],
     rules: {
       "no-restricted-syntax": [
         "error",
@@ -25,21 +25,21 @@ export const directivesConfigs = [
           selector:
             "Program > :first-child:not(ExpressionStatement[expression.value='use server'])",
           message:
-            'interactors/admin.ts must start with "use server" directive.',
+            'entries/admin.ts must start with "use server" directive.',
         },
       ],
     },
   },
   {
-    name: "directives/client-interactor",
-    files: ["src/features/**/interactors/client.ts"],
+    name: "directives/client-entry",
+    files: ["src/features/**/entries/client.ts"],
     rules: {
       "no-restricted-syntax": [
         "error",
         {
           selector: "ExpressionStatement[expression.value='use server']",
           message:
-            'interactors/client.ts must NOT have "use server" directive. It uses @/lib/supabase/client.',
+            'entries/client.ts must NOT have "use server" directive. It uses @/lib/supabase/client.',
         },
       ],
     },