@yasainet/eslint 0.0.50 → 0.0.52

package/README.md

@@ -25,9 +25,9 @@ Each entry point enforces a feature-based architecture with the following conven
 ```text
 {featureRoot}/
 ├── {feature}/
-│   ├── actions/        # *.action.ts — entry points (handleXxx)
+│   ├── interactors/    # *.interactor.ts — entry points
 │   ├── services/       # *.service.ts — business logic
-│   ├── repositories/   # *.repo.ts — data access
+│   ├── queries/        # *.query.ts — data access
 │   ├── types/          # *.type.ts
 │   ├── schemas/        # *.schema.ts
 │   ├── utils/          # *.util.ts
@@ -35,7 +35,7 @@ Each entry point enforces a feature-based architecture with the following conven
 ├── shared/             # Cross-feature shared modules
 ├── ...
 {libRoot}/              # *.lib.ts — library wrappers (e.g., supabase.lib.ts)
-{utilsRoot}/            # *.util.ts — top-level utilities
+{utilsRoot}/            # *.util.ts — top-level utilities (e.g., font.util.ts)
 ```
 
 ## Setup

package/package.json

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

package/src/common/imports.mjs

@@ -1,46 +1,46 @@
 const LAYER_PATTERNS = {
-  repositories: [
+  queries: [
     {
       group: ["*/services/*", "*/services"],
-      message: "repositories cannot import services (layer violation)",
+      message: "queries cannot import services (layer violation)",
     },
     {
-      group: ["*/actions/*", "*/actions"],
-      message: "repositories cannot import actions (layer violation)",
+      group: ["*/interactors/*", "*/interactors"],
+      message: "queries cannot import interactors (layer violation)",
     },
     {
       group: ["*/hooks/*", "*/hooks"],
-      message: "repositories cannot import hooks (layer violation)",
+      message: "queries cannot import hooks (layer violation)",
     },
   ],
   services: [
     {
-      group: ["*/actions/*", "*/actions"],
-      message: "services cannot import actions (layer violation)",
+      group: ["*/interactors/*", "*/interactors"],
+      message: "services cannot import interactors (layer violation)",
     },
     {
       group: ["*/hooks/*", "*/hooks"],
       message: "services cannot import hooks (layer violation)",
     },
   ],
-  actions: [
+  interactors: [
     {
-      group: ["*/repositories/*", "*/repositories"],
-      message: "actions cannot import repositories (layer violation)",
+      group: ["*/queries/*", "*/queries"],
+      message: "interactors cannot import queries (layer violation)",
     },
     {
       group: ["*/hooks/*", "*/hooks"],
-      message: "actions cannot import hooks (layer violation)",
+      message: "interactors cannot import hooks (layer violation)",
     },
   ],
 };
 
 const LATERAL_PATTERNS = {
-  repositories: [
+  queries: [
     {
-      group: ["@/features/*/repositories/*", "@/features/*/repositories"],
+      group: ["@/features/*/queries/*", "@/features/*/queries"],
       message:
-        "repositories cannot import other feature's repositories (lateral violation)",
+        "queries cannot import other feature's queries (lateral violation)",
     },
   ],
   services: [
@@ -50,11 +50,11 @@ const LATERAL_PATTERNS = {
         "services cannot import other feature's services (lateral violation)",
     },
   ],
-  actions: [
+  interactors: [
     {
-      group: ["@/features/*/actions/*", "@/features/*/actions"],
+      group: ["@/features/*/interactors/*", "@/features/*/interactors"],
       message:
-        "actions cannot import other feature's actions (lateral violation)",
+        "interactors cannot import other feature's interactors (lateral violation)",
     },
   ],
 };
@@ -64,21 +64,21 @@ const CARDINALITY_PATTERNS = {
     {
       group: ["**/services/client.service*", "**/services/admin.service*"],
       message:
-        "server.action can only import server.service (cardinality violation)",
+        "server.interactor can only import server.service (cardinality violation)",
     },
   ],
   client: [
     {
       group: ["**/services/server.service*", "**/services/admin.service*"],
       message:
-        "client.action can only import client.service (cardinality violation)",
+        "client.interactor can only import client.service (cardinality violation)",
     },
   ],
   admin: [
     {
       group: ["**/services/server.service*", "**/services/client.service*"],
       message:
-        "admin.action can only import admin.service (cardinality violation)",
+        "admin.interactor can only import admin.service (cardinality violation)",
     },
   ],
 };
@@ -90,7 +90,7 @@ function prefixLibPatterns(prefix, mapping) {
     .filter((p) => p !== prefix)
     .map((p) => ({
       group: [`**/lib/${mapping[p]}`, `**/lib/${mapping[p]}/*`],
-      message: `${prefix}.repo.ts can only import from lib/${allowedLib}. Use the correct repository file for this lib.`,
+      message: `${prefix}.query.ts can only import from lib/${allowedLib}. Use the correct query file for this lib.`,
     }));
 }
 
@@ -98,7 +98,7 @@ const LIB_BOUNDARY_PATTERNS = [
   {
     group: ["@/lib/*", "@/lib/**"],
     message:
-      "lib/* can only be imported from repositories (lib-boundary violation)",
+      "lib/* can only be imported from queries (lib-boundary violation)",
   },
 ];
 
@@ -113,40 +113,40 @@ const MAPPING_PATTERNS = [
 
 const PAGE_BOUNDARY_PATTERNS = [
   {
-    group: ["*/repositories/*", "*/repositories"],
+    group: ["*/queries/*", "*/queries"],
     message:
-      "page.tsx can only import actions, not repositories (page-boundary violation)",
+      "page.tsx can only import interactors, not queries (page-boundary violation)",
   },
   {
     group: ["*/services/*", "*/services"],
     message:
-      "page.tsx can only import actions, not services (page-boundary violation)",
+      "page.tsx can only import interactors, not services (page-boundary violation)",
   },
 ];
 
 const HOOKS_BOUNDARY_PATTERNS = [
   {
-    group: ["*/repositories/*", "*/repositories"],
+    group: ["*/queries/*", "*/queries"],
     message:
-      "hooks can only import actions, not repositories (hooks-boundary violation)",
+      "hooks can only import interactors, not queries (hooks-boundary violation)",
   },
   {
     group: ["*/services/*", "*/services"],
     message:
-      "hooks can only import actions, not services (hooks-boundary violation)",
+      "hooks can only import interactors, not services (hooks-boundary violation)",
   },
 ];
 
 const COMPONENTS_BOUNDARY_PATTERNS = [
   {
-    group: ["*/repositories/*", "*/repositories"],
+    group: ["*/queries/*", "*/queries"],
     message:
-      "components can only import actions or hooks, not repositories (components-boundary violation)",
+      "components can only import interactors or hooks, not queries (components-boundary violation)",
   },
   {
     group: ["*/services/*", "*/services"],
     message:
-      "components can only import actions or hooks, not services (components-boundary violation)",
+      "components can only import interactors or hooks, not services (components-boundary violation)",
   },
 ];
 
@@ -162,7 +162,7 @@ function makeConfig(name, files, ...patternArrays) {
   };
 }
 
-/** Next.js-only: restrict page.tsx to only import actions. */
+/** Next.js-only: restrict page.tsx to only import interactors. */
 export const pageBoundaryConfigs = [
   {
     name: "imports/page-boundary",
@@ -173,7 +173,7 @@ export const pageBoundaryConfigs = [
   },
 ];
 
-/** Next.js-only: restrict hooks to only import actions (not repositories or services). */
+/** Next.js-only: restrict hooks to only import interactors (not queries or services). */
 export const hooksBoundaryConfigs = [
   {
     name: "imports/hooks-boundary",
@@ -184,7 +184,7 @@ export const hooksBoundaryConfigs = [
   },
 ];
 
-/** Next.js-only: restrict components to only import actions or hooks (not repositories or services). */
+/** Next.js-only: restrict components to only import interactors or hooks (not queries or services). */
 export const componentsBoundaryConfigs = [
   {
     name: "imports/components-boundary",
@@ -253,10 +253,10 @@ export function createImportsConfigs(
 
   configs.push(
     makeConfig(
-      "repositories",
-      [`${featureRoot}/**/repositories/*.ts`],
-      LAYER_PATTERNS.repositories,
-      LATERAL_PATTERNS.repositories,
+      "queries",
+      [`${featureRoot}/**/queries/*.ts`],
+      LAYER_PATTERNS.queries,
+      LATERAL_PATTERNS.queries,
       MAPPING_PATTERNS,
     ),
   );
@@ -266,10 +266,10 @@ export function createImportsConfigs(
     if (patterns.length === 0) continue;
     configs.push(
       makeConfig(
-        `repositories/${prefix}`,
-        [`${featureRoot}/**/repositories/${prefix}.repo.ts`],
-        LAYER_PATTERNS.repositories,
-        LATERAL_PATTERNS.repositories,
+        `queries/${prefix}`,
+        [`${featureRoot}/**/queries/${prefix}.query.ts`],
+        LAYER_PATTERNS.queries,
+        LATERAL_PATTERNS.queries,
         patterns,
         MAPPING_PATTERNS,
       ),
@@ -288,10 +288,10 @@ export function createImportsConfigs(
 
   configs.push(
     makeConfig(
-      "actions",
-      [`${featureRoot}/**/actions/*.ts`],
-      LAYER_PATTERNS.actions,
-      LATERAL_PATTERNS.actions,
+      "interactors",
+      [`${featureRoot}/**/interactors/*.ts`],
+      LAYER_PATTERNS.interactors,
+      LATERAL_PATTERNS.interactors,
       LIB_BOUNDARY_PATTERNS,
       MAPPING_PATTERNS,
     ),
@@ -313,8 +313,8 @@ export function createImportsConfigs(
     files: [`${featureRoot}/**/*.ts`],
     ignores: [
       `${featureRoot}/**/services/*.ts`,
-      `${featureRoot}/**/repositories/*.ts`,
-      `${featureRoot}/**/actions/*.ts`,
+      `${featureRoot}/**/queries/*.ts`,
+      `${featureRoot}/**/interactors/*.ts`,
       `${featureRoot}/**/utils/*.ts`,
       `${featureRoot}/**/types/*.ts`,
     ],
@@ -338,10 +338,10 @@ export function createImportsConfigs(
   for (const prefix of ["server", "client", "admin"]) {
     configs.push(
       makeConfig(
-        `actions/${prefix}`,
-        [`${featureRoot}/**/actions/${prefix}.action.ts`],
-        LAYER_PATTERNS.actions,
-        LATERAL_PATTERNS.actions,
+        `interactors/${prefix}`,
+        [`${featureRoot}/**/interactors/${prefix}.interactor.ts`],
+        LAYER_PATTERNS.interactors,
+        LATERAL_PATTERNS.interactors,
         CARDINALITY_PATTERNS[prefix],
         LIB_BOUNDARY_PATTERNS,
         MAPPING_PATTERNS,

package/src/common/jsdoc.mjs

@@ -8,7 +8,7 @@ export function createJsdocConfigs(featureRoot) {
     {
       name: "jsdoc",
       files: [
-        ...featuresGlob(featureRoot, "**/repositories/*.ts"),
+        ...featuresGlob(featureRoot, "**/queries/*.ts"),
         ...featuresGlob(featureRoot, "**/services*/*.ts"),
         ...featuresGlob(featureRoot, "**/utils*/*.ts"),
       ],

package/src/common/layers.mjs

@@ -4,14 +4,14 @@ import { localPlugin } from "./local-plugins/index.mjs";
 export function createLayersConfigs(featureRoot) {
   const loggerSelector = "CallExpression[callee.object.name='logger']";
   const loggerMessage =
-    "logger is not allowed outside actions. Logging belongs in actions.";
+    "logger is not allowed outside interactors. Logging belongs in interactors.";
 
   return [
-    // Logger/console: all features except actions
+    // Logger/console: all features except interactors
     {
       name: "layers/logger",
       files: [`${featureRoot}/**/*.ts`],
-      ignores: [`${featureRoot}/**/actions/*.ts`],
+      ignores: [`${featureRoot}/**/interactors/*.ts`],
       rules: {
         "no-console": "error",
         "no-restricted-syntax": [
@@ -20,64 +20,64 @@ export function createLayersConfigs(featureRoot) {
         ],
       },
     },
-    // Repositories: try-catch + if + loops + logger
+    // Queries: try-catch + if + loops + logger
     {
-      name: "layers/repositories",
-      files: [`${featureRoot}/**/repositories/*.ts`],
+      name: "layers/queries",
+      files: [`${featureRoot}/**/queries/*.ts`],
       rules: {
         "no-restricted-syntax": [
           "error",
           {
             selector: "TryStatement",
             message:
-              "try-catch is not allowed in repositories. Error handling belongs in actions.",
+              "try-catch is not allowed in queries. Error handling belongs in interactors.",
           },
           {
             selector: "IfStatement",
             message:
-              "if statements are not allowed in repositories. Conditional logic belongs in services.",
+              "if statements are not allowed in queries. Conditional logic belongs in services.",
           },
           {
             selector: "ForStatement",
             message:
-              "Loops are not allowed in repositories. Repositories should be thin CRUD wrappers — iteration belongs in services.",
+              "Loops are not allowed in queries. Queries should be thin CRUD wrappers — iteration belongs in services.",
           },
           {
             selector: "ForOfStatement",
             message:
-              "Loops are not allowed in repositories. Repositories should be thin CRUD wrappers — iteration belongs in services.",
+              "Loops are not allowed in queries. Queries should be thin CRUD wrappers — iteration belongs in services.",
           },
           {
             selector: "ForInStatement",
             message:
-              "Loops are not allowed in repositories. Repositories should be thin CRUD wrappers — iteration belongs in services.",
+              "Loops are not allowed in queries. Queries should be thin CRUD wrappers — iteration belongs in services.",
           },
           {
             selector: "WhileStatement",
             message:
-              "Loops are not allowed in repositories. Repositories should be thin CRUD wrappers — iteration belongs in services.",
+              "Loops are not allowed in queries. Queries should be thin CRUD wrappers — iteration belongs in services.",
           },
           {
             selector: "DoWhileStatement",
             message:
-              "Loops are not allowed in repositories. Repositories should be thin CRUD wrappers — iteration belongs in services.",
+              "Loops are not allowed in queries. Queries should be thin CRUD wrappers — iteration belongs in services.",
           },
           {
             selector: "ThrowStatement",
             message:
-              "throw is not allowed in repositories. Repositories must return Supabase's { data, error } shape as-is. Error handling belongs in actions.",
+              "throw is not allowed in queries. Queries must return Supabase's { data, error } shape as-is. Error handling belongs in interactors.",
           },
           { selector: loggerSelector, message: loggerMessage },
         ],
       },
     },
-    // Boundary type safety: repositories & services must not leak `any`
+    // 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}/**/repositories/*.ts`,
+        `${featureRoot}/**/queries/*.ts`,
         `${featureRoot}/**/services/*.ts`,
       ],
       plugins: { local: localPlugin },
@@ -95,20 +95,20 @@ export function createLayersConfigs(featureRoot) {
           {
             selector: "TryStatement",
             message:
-              "try-catch is not allowed in services. Error handling belongs in actions.",
+              "try-catch is not allowed in services. Error handling belongs in interactors.",
           },
           { 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 actions.",
+              "Dead fallback for error message. If you reached this branch the error is known — return the error directly. Unhandled exceptions belong in interactors.",
           },
           {
             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 actions.",
+              "Dead fallback for nullable error. Check `if (error)` and return the error directly. Unhandled exceptions belong in interactors.",
           },
         ],
       },

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

@@ -1,18 +1,18 @@
-import { actionHandleServiceRule } from "./action-handle-service.mjs";
 import { featureNameRule } from "./feature-name.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 { schemaNamingRule } from "./schema-naming.mjs";
 
 /** Single plugin object to avoid ESLint "Cannot redefine plugin" errors. */
 export const localPlugin = {
   rules: {
-    "action-handle-service": actionHandleServiceRule,
     "feature-name": featureNameRule,
     "import-path-style": importPathStyleRule,
     "namespace-import-name": namespaceImportNameRule,
     "no-any-return": noAnyReturnRule,
+    "queries-export": queriesExportRule,
     "schema-naming": schemaNamingRule,
   },
 };

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

@@ -7,10 +7,10 @@
 
 /** @type {Record<string, string>} */
 const LAYER_MAP = {
-  repo: "Repository",
+  query: "Query",
   service: "Service",
   domain: "Domain",
-  action: "Action",
+  interactor: "Interactor",
   util: "Util",
   type: "Type",
   schema: "Schema",

package/src/common/local-plugins/no-any-return.mjs

@@ -4,7 +4,7 @@ import ts from "typescript";
  * Exported function の return type が any を含んでいる場合に error:
  *
  * - typescript-eslint の type checker を使って inferred type まで見る
- * - repositories / services の API 境界を any 汚染から守ることで、domain shape が型で保証される
+ * - queries / services の API 境界を any 汚染から守ることで、domain shape が型で保証される
  * - Promise<any>, Promise<{ data: any }>, Array<any> など nested も展開して検査する
  */
 export const noAnyReturnRule = {

package/src/common/local-plugins/queries-export.mjs

@@ -0,0 +1,65 @@
+/**
+ * Enforce verb allow list for `queries/*.query.ts` exports.
+ *
+ * The queries layer is the TS-idiomatic translation of Rails 5 actions
+ * (index/show -> get, create, update, destroy -> delete). Auth ceremonies
+ * (signUp / signIn / signOut) are admitted as industry-standard exceptions.
+ */
+
+const QUERIES_ALLOW = /^(get|create|update|delete|signUp|signIn|signOut)([A-Z]|$)/;
+
+function isFunctionLike(initNode) {
+  if (!initNode) return false;
+  const t = initNode.type;
+  if (t === "ArrowFunctionExpression" || t === "FunctionExpression") return true;
+  if (t === "CallExpression") {
+    return initNode.arguments.some(
+      (arg) =>
+        arg.type === "ArrowFunctionExpression" ||
+        arg.type === "FunctionExpression",
+    );
+  }
+  return false;
+}
+
+function reportIfInvalid(context, idNode) {
+  if (!QUERIES_ALLOW.test(idNode.name)) {
+    context.report({
+      node: idNode,
+      messageId: "invalidName",
+      data: { name: idNode.name },
+    });
+  }
+}
+
+export const queriesExportRule = {
+  meta: {
+    type: "problem",
+    messages: {
+      invalidName:
+        "queries export '{{ name }}' must start with one of: get, create, update, delete, signUp, signIn, signOut. (Rails 5 actions translated to TS idiom)",
+    },
+    schema: [],
+  },
+  create(context) {
+    return {
+      ExportNamedDeclaration(node) {
+        if (!node.declaration) return;
+        const decl = node.declaration;
+
+        if (decl.type === "FunctionDeclaration" && decl.id) {
+          reportIfInvalid(context, decl.id);
+          return;
+        }
+
+        if (decl.type === "VariableDeclaration") {
+          for (const variator of decl.declarations) {
+            if (variator.id.type !== "Identifier") continue;
+            if (!isFunctionLike(variator.init)) continue;
+            reportIfInvalid(context, variator.id);
+          }
+        }
+      },
+    };
+  },
+};

package/src/common/naming.mjs

@@ -52,10 +52,10 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
   const servicePattern = prefixPattern
     ? `${prefixPattern}.service`
     : "*.service";
-  const repoPattern = prefixPattern ? `${prefixPattern}.repo` : "*.repo";
-  const actionPattern = prefixPattern
-    ? `${prefixPattern}.action`
-    : "*.action";
+  const queryPattern = prefixPattern ? `${prefixPattern}.query` : "*.query";
+  const interactorPattern = prefixPattern
+    ? `${prefixPattern}.interactor`
+    : "*.interactor";
 
   const configs = [];
 
@@ -91,17 +91,25 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
       },
     },
     {
-      name: "naming/repositories",
-      files: featuresGlob(featureRoot, "**/repositories/*.ts"),
-      ignores: featuresGlob(featureRoot, "shared/repositories/*.ts"),
+      name: "naming/queries",
+      files: featuresGlob(featureRoot, "**/queries/*.ts"),
+      ignores: featuresGlob(featureRoot, "shared/queries/*.ts"),
       plugins: { "check-file": checkFile },
       rules: {
         "check-file/filename-naming-convention": [
           "error",
-          { "**/*.ts": repoPattern },
+          { "**/*.ts": queryPattern },
         ],
       },
     },
+    {
+      name: "naming/queries-export",
+      files: featuresGlob(featureRoot, "**/queries/*.query.ts"),
+      plugins: { local: localPlugin },
+      rules: {
+        "local/queries-export": "error",
+      },
+    },
   );
 
   configs.push(
@@ -117,13 +125,13 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
       },
     },
     {
-      name: "naming/repositories-shared",
-      files: featuresGlob(featureRoot, "shared/repositories/*.ts"),
+      name: "naming/queries-shared",
+      files: featuresGlob(featureRoot, "shared/queries/*.ts"),
       plugins: { "check-file": checkFile },
       rules: {
         "check-file/filename-naming-convention": [
           "error",
-          { "**/*.ts": `${sharedPrefixPattern}.repo` },
+          { "**/*.ts": `${sharedPrefixPattern}.query` },
         ],
       },
     },
@@ -237,53 +245,30 @@ export function createNamingConfigs(featureRoot, prefixLibMapping) {
   );
 
   configs.push({
-    name: "naming/actions",
-    files: featuresGlob(featureRoot, "**/actions/*.ts"),
-    ignores: featuresGlob(featureRoot, "shared/actions/*.ts"),
+    name: "naming/interactors",
+    files: featuresGlob(featureRoot, "**/interactors/*.ts"),
+    ignores: featuresGlob(featureRoot, "shared/interactors/*.ts"),
     plugins: { "check-file": checkFile },
     rules: {
       "check-file/filename-naming-convention": [
         "error",
-        { "**/*.ts": actionPattern },
+        { "**/*.ts": interactorPattern },
       ],
     },
   });
 
   configs.push(
     {
-      name: "naming/actions-shared",
-      files: featuresGlob(featureRoot, "shared/actions/*.ts"),
+      name: "naming/interactors-shared",
+      files: featuresGlob(featureRoot, "shared/interactors/*.ts"),
       plugins: { "check-file": checkFile },
       rules: {
         "check-file/filename-naming-convention": [
           "error",
-          { "**/*.ts": `${sharedPrefixPattern}.action` },
-        ],
-      },
-    },
-    {
-      name: "naming/actions-export",
-      files: featuresGlob(featureRoot, "**/actions/*.ts"),
-      rules: {
-        "no-restricted-syntax": [
-          "error",
-          {
-            selector:
-              "ExportNamedDeclaration > FunctionDeclaration[id.name!=/^handle[A-Z]/]",
-            message:
-              "Exported functions in actions must start with 'handle' (e.g., handleGetComics).",
-          },
+          { "**/*.ts": `${sharedPrefixPattern}.interactor` },
         ],
       },
     },
-    {
-      name: "naming/actions-handle-service",
-      files: featuresGlob(featureRoot, "**/actions/*.ts"),
-      plugins: { local: localPlugin },
-      rules: {
-        "local/action-handle-service": "error",
-      },
-    },
     {
       name: "naming/features-ts-only",
       files: featuresGlob(featureRoot, "**/*.tsx"),

package/src/deno/imports.mjs

@@ -10,7 +10,7 @@ export const denoImportsConfigs = [
     files: [`${FUNCTIONS_ROOT}/**/*.ts`],
     ignores: [
       `${FUNCTIONS_ROOT}/_lib/**`,
-      `${FEATURE_ROOT}/**/repositories/**`,
+      `${FEATURE_ROOT}/**/queries/**`,
       `${FEATURE_ROOT}/**/types/**`,
     ],
     rules: {
@@ -21,7 +21,7 @@ export const denoImportsConfigs = [
             {
               group: ["*/_lib/*", "*/_lib/**"],
               message:
-                "_lib/ can only be imported from repositories (lib-boundary violation)",
+                "_lib/ can only be imported from queries (lib-boundary violation)",
             },
           ],
         },
@@ -40,17 +40,17 @@ export const denoImportsConfigs = [
             {
               group: ["**/services/*", "**/services"],
               message:
-                "Entry points must not import services directly. Import from actions instead.",
+                "Entry points must not import services directly. Import from interactors instead.",
             },
             {
-              group: ["**/repositories/*", "**/repositories"],
+              group: ["**/queries/*", "**/queries"],
               message:
-                "Entry points must not import repositories directly. Import from actions instead.",
+                "Entry points must not import queries directly. Import from interactors instead.",
             },
             {
               group: ["*/_lib/*", "*/_lib/**"],
               message:
-                "Entry points must not import _lib/ directly. Import from actions instead.",
+                "Entry points must not import _lib/ directly. Import from interactors instead.",
             },
           ],
         },

package/src/next/directives.mjs

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

package/src/common/local-plugins/action-handle-service.mjs

@@ -1,58 +0,0 @@
-/** In *.action.ts, handleXxx must call the service method *.xxx(). */
-export const actionHandleServiceRule = {
-  meta: {
-    type: "problem",
-    messages: {
-      missingCall:
-        "handleXxx must call the corresponding service method '*.{{ expected }}()'.",
-    },
-    schema: [],
-  },
-  create(context) {
-    return {
-      "ExportNamedDeclaration > FunctionDeclaration[id.name=/^handle[A-Z]/]"(
-        node,
-      ) {
-        const name = node.id.name;
-        const suffix = name.slice("handle".length);
-        const expected = suffix[0].toLowerCase() + suffix.slice(1);
-
-        let found = false;
-
-        function walk(n) {
-          if (found || !n || typeof n !== "object") return;
-
-          if (
-            n.type === "CallExpression" &&
-            n.callee.type === "MemberExpression" &&
-            !n.callee.computed &&
-            n.callee.property.name === expected
-          ) {
-            found = true;
-            return;
-          }
-
-          for (const key of Object.keys(n)) {
-            if (key === "parent") continue;
-            const child = n[key];
-            if (Array.isArray(child)) {
-              for (const item of child) walk(item);
-            } else if (child && typeof child.type === "string") {
-              walk(child);
-            }
-          }
-        }
-
-        walk(node.body);
-
-        if (!found) {
-          context.report({
-            node: node.id,
-            messageId: "missingCall",
-            data: { expected },
-          });
-        }
-      },
-    };
-  },
-};