@yasainet/eslint 0.0.82 → 0.0.84

package/package.json

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

package/src/common/_internal/constants.mjs

@@ -1,24 +1,13 @@
 import fs from "fs";
 import path from "path";
-import { fileURLToPath } from "url";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+import { findUp } from "./find-up.mjs";
 
-function findProjectRoot() {
-  let dir = __dirname;
-  while (dir !== path.dirname(dir)) {
-    if (
-      fs.existsSync(path.join(dir, "package.json")) &&
-      !dir.includes("/node_modules/")
-    ) {
-      return dir;
-    }
-    dir = path.dirname(dir);
-  }
-  return process.cwd();
-}
-
-const PROJECT_ROOT = findProjectRoot();
+const PROJECT_ROOT = findUp(
+  import.meta.dirname,
+  (dir) => (fs.existsSync(path.join(dir, "package.json")) ? dir : null),
+  process.cwd(),
+);
 
 const EXCLUDE_LIST = ["types.ts", "proxy.ts", "utils.ts"];
 

package/src/common/_internal/find-up.mjs

@@ -0,0 +1,18 @@
+import { dirname, sep } from "node:path";
+
+/**
+ * 祖先ディレクトリを遡り、resolve(dir) が truthy を返した値を返す。
+ * node_modules 配下 (path segment 判定) は skip。
+ * root まで到達しても見つからなければ fallback を返す。
+ */
+export function findUp(start, resolve, fallback) {
+  let dir = start;
+  while (dir !== dirname(dir)) {
+    if (!dir.split(sep).includes("node_modules")) {
+      const found = resolve(dir);
+      if (found) return found;
+    }
+    dir = dirname(dir);
+  }
+  return fallback;
+}

package/src/common/_internal/plugins.mjs

@@ -2,10 +2,4 @@ import stylistic from "@stylistic/eslint-plugin";
 import checkFile from "eslint-plugin-check-file";
 import simpleImportSortPlugin from "eslint-plugin-simple-import-sort";
 
-export const plugins = {
-  "@stylistic": stylistic,
-  "check-file": checkFile,
-  "simple-import-sort": simpleImportSortPlugin,
-};
-
 export { checkFile, simpleImportSortPlugin, stylistic };

package/src/common/base/typescript.mjs

@@ -1,25 +1,16 @@
 import { existsSync } from "node:fs";
-import { dirname, join, sep } from "node:path";
+import { join } from "node:path";
 
 import tseslint from "typescript-eslint";
 
+import { findUp } from "../_internal/find-up.mjs";
 import { simpleImportSortPlugin, stylistic } from "../_internal/plugins.mjs";
 
-const findProjectRoot = (start) => {
-  let dir = start;
-  while (dir !== dirname(dir)) {
-    if (
-      !dir.split(sep).includes("node_modules") &&
-      existsSync(join(dir, "tsconfig.json"))
-    ) {
-      return dir;
-    }
-    dir = dirname(dir);
-  }
-  return process.cwd();
-};
-
-const projectRoot = findProjectRoot(import.meta.dirname);
+const projectRoot = findUp(
+  import.meta.dirname,
+  (dir) => (existsSync(join(dir, "tsconfig.json")) ? dir : null),
+  process.cwd(),
+);
 
 const sharedRulesConfig = {
   name: "rules/shared",

package/src/common/layers/queries.mjs

@@ -112,27 +112,8 @@ export function createQueriesConfigs({ featureRoot, prefixLibMapping }) {
               "queries で if 文は禁止。条件分岐は services に置く。",
           },
           {
-            selector: "ForStatement",
-            message:
-              "queries でループは禁止。queries は薄い CRUD ラッパー、反復は services に置く。",
-          },
-          {
-            selector: "ForOfStatement",
-            message:
-              "queries でループは禁止。queries は薄い CRUD ラッパー、反復は services に置く。",
-          },
-          {
-            selector: "ForInStatement",
-            message:
-              "queries でループは禁止。queries は薄い CRUD ラッパー、反復は services に置く。",
-          },
-          {
-            selector: "WhileStatement",
-            message:
-              "queries でループは禁止。queries は薄い CRUD ラッパー、反復は services に置く。",
-          },
-          {
-            selector: "DoWhileStatement",
+            selector:
+              "ForStatement, ForOfStatement, ForInStatement, WhileStatement, DoWhileStatement",
             message:
               "queries でループは禁止。queries は薄い CRUD ラッパー、反復は services に置く。",
           },

package/src/common/local-plugins/supabase-columns-satisfies.mjs

@@ -1,15 +1,58 @@
 const COLUMNS_NAME = /^[A-Z][A-Z0-9_]*_COLUMNS$/;
 
-function isStringAsConst(initNode) {
-  if (!initNode) return false;
-  if (initNode.type !== "TSAsExpression") return false;
+function isAsConst(initNode) {
+  if (!initNode || initNode.type !== "TSAsExpression") return false;
   const ann = initNode.typeAnnotation;
   if (!ann || ann.type !== "TSTypeReference") return false;
   if (ann.typeName.type !== "Identifier") return false;
-  if (ann.typeName.name !== "const") return false;
+  return ann.typeName.name === "const";
+}
+
+function isAsConstStringLiteral(initNode) {
+  if (!isAsConst(initNode)) return false;
+  const inner = initNode.expression;
+  return inner.type === "Literal" && typeof inner.value === "string";
+}
+
+function isLocalAsConstStringRef(identifier, sourceCode) {
+  let scope = sourceCode.getScope(identifier);
+  while (scope) {
+    const variable = scope.set.get(identifier.name);
+    if (variable) {
+      const def = variable.defs[0];
+      if (!def || def.type !== "Variable") return false;
+      if (def.parent?.kind !== "const") return false;
+      return isAsConstStringLiteral(def.node.init);
+    }
+    scope = scope.upper;
+  }
+  return false;
+}
+
+/**
+ * `*_COLUMNS` 定数の shape を検証し、Supabase `.select()` の型推論を保つ。
+ *
+ * 許容するのは以下のいずれか:
+ * - `"..." as const` (string literal)
+ * - `` `${IDENT}, ...` as const `` (template literal で interpolation が
+ *   全て **同一 file scope の as const string literal Identifier** であるもの)
+ *
+ * Why-not type-aware (cross-module 追跡): rule を dumb で機械的に保つため
+ * scope manager の参照解決のみで検査する。派生定数を作りたい場合は base 定数と
+ * 同じ file に集約する運用とする (詳細: yasainet/eslint#3)。
+ */
+function isValidShape(initNode, sourceCode) {
+  if (!isAsConst(initNode)) return false;
   const inner = initNode.expression;
-  if (inner.type !== "Literal") return false;
-  return typeof inner.value === "string";
+  if (inner.type === "Literal") return typeof inner.value === "string";
+  if (inner.type === "TemplateLiteral") {
+    return inner.expressions.every(
+      (expr) =>
+        expr.type === "Identifier" &&
+        isLocalAsConstStringRef(expr, sourceCode),
+    );
+  }
+  return false;
 }
 
 export const supabaseColumnsSatisfiesRule = {
@@ -17,17 +60,18 @@ export const supabaseColumnsSatisfiesRule = {
     type: "problem",
     messages: {
       shape:
-        'column 定数 `{{ name }}` は `"<comma-separated columns>" as const` にする。`as const` を外すと Supabase の `.select()` 型推論が壊れる。配列 / template literal も不可。',
+        'column 定数 `{{ name }}` は `"..." as const` か、`` `${BASE}, ...` as const `` で同一 file 内の as const literal を合成する。配列 / 識別子追跡不可能な template literal / 文字列結合は不可。`as const` を外すと Supabase `.select()` の型推論が壊れる。',
     },
     schema: [],
   },
   create(context) {
+    const sourceCode = context.sourceCode;
     return {
       VariableDeclarator(node) {
         if (node.id.type !== "Identifier") return;
         if (!COLUMNS_NAME.test(node.id.name)) return;
         if (!node.init) return;
-        if (isStringAsConst(node.init)) return;
+        if (isValidShape(node.init, sourceCode)) return;
         context.report({
           node: node.id,
           messageId: "shape",

package/src/next/boundaries/callee-boundaries.mjs

@@ -0,0 +1,59 @@
+import {
+  LIB_BOUNDARY_PATTERNS,
+  MAPPING_PATTERNS,
+} from "../../common/_internal/import-patterns.mjs";
+
+function createCalleeBoundaryConfig({ name, files, surface, via = "entries" }) {
+  return {
+    name,
+    files,
+    rules: {
+      "no-restricted-imports": [
+        "error",
+        {
+          patterns: [
+            {
+              group: ["**/queries/*", "**/queries"],
+              message: `${surface} は queries を直接 import 不可。${via} 経由で使う。`,
+            },
+            {
+              group: ["**/services/*", "**/services"],
+              message: `${surface} は services を直接 import 不可。${via} 経由で使う。`,
+            },
+            ...LIB_BOUNDARY_PATTERNS,
+            ...MAPPING_PATTERNS,
+          ],
+        },
+      ],
+    },
+  };
+}
+
+export const calleeBoundaryConfigs = [
+  createCalleeBoundaryConfig({
+    name: "imports/page-boundary",
+    surface: "page.tsx",
+    files: ["src/app/**/page.tsx"],
+  }),
+  createCalleeBoundaryConfig({
+    name: "imports/route-boundary",
+    surface: "route.ts",
+    files: ["src/app/**/route.ts"],
+  }),
+  createCalleeBoundaryConfig({
+    name: "imports/sitemap-boundary",
+    surface: "sitemap.ts",
+    files: ["src/app/sitemap.ts", "src/app/**/sitemap.ts"],
+  }),
+  createCalleeBoundaryConfig({
+    name: "imports/hooks-boundary",
+    surface: "hooks",
+    files: ["src/features/**/hooks/*.ts"],
+  }),
+  createCalleeBoundaryConfig({
+    name: "imports/components-boundary",
+    surface: "components",
+    files: ["src/components/**/*.{ts,tsx}"],
+    via: "entries か hooks",
+  }),
+];

package/src/next/directives.mjs

@@ -1,7 +1,10 @@
 export const directivesConfigs = [
   {
-    name: "directives/server-entry",
-    files: ["src/features/**/entries/server.ts"],
+    name: "directives/server-side-entry",
+    files: [
+      "src/features/**/entries/server.ts",
+      "src/features/**/entries/admin.ts",
+    ],
     rules: {
       "no-restricted-syntax": [
         "error",
@@ -9,22 +12,7 @@ export const directivesConfigs = [
           selector:
             "Program > :first-child:not(ExpressionStatement[expression.value='use server'])",
           message:
-            'entries/server.ts は先頭に "use server" directive が必須。',
-        },
-      ],
-    },
-  },
-  {
-    name: "directives/admin-entry",
-    files: ["src/features/**/entries/admin.ts"],
-    rules: {
-      "no-restricted-syntax": [
-        "error",
-        {
-          selector:
-            "Program > :first-child:not(ExpressionStatement[expression.value='use server'])",
-          message:
-            'entries/admin.ts は先頭に "use server" directive が必須。',
+            'server-side entries (server.ts / admin.ts) は先頭に "use server" directive が必須。',
         },
       ],
     },

package/src/next/index.mjs

@@ -1,12 +1,8 @@
 import { createEntryPointConfigs } from "../common/boundaries/entry-point.mjs";
 import { createCommonConfigs } from "../common/index.mjs";
 
-import { componentsBoundaryConfigs } from "./boundaries/components.mjs";
-import { hooksBoundaryConfigs } from "./boundaries/hooks.mjs";
+import { calleeBoundaryConfigs } from "./boundaries/callee-boundaries.mjs";
 import { libBoundaryConfigs } from "./boundaries/lib.mjs";
-import { pageBoundaryConfigs } from "./boundaries/page.mjs";
-import { routeBoundaryConfigs } from "./boundaries/route.mjs";
-import { sitemapBoundaryConfigs } from "./boundaries/sitemap.mjs";
 import { directivesConfigs } from "./directives.mjs";
 import { importPathStyleConfigs } from "./imports.mjs";
 import { componentsLayerConfigs } from "./layers/components.mjs";
@@ -25,11 +21,7 @@ export const eslintConfig = [
   },
   ...createCommonConfigs("src/features"),
   ...libBoundaryConfigs,
-  ...pageBoundaryConfigs,
-  ...routeBoundaryConfigs,
-  ...sitemapBoundaryConfigs,
-  ...hooksBoundaryConfigs,
-  ...componentsBoundaryConfigs,
+  ...calleeBoundaryConfigs,
   ...hooksLayerConfigs,
   ...componentsLayerConfigs,
   ...directivesConfigs,

package/src/next/tailwindcss.mjs

@@ -1,23 +1,18 @@
 import { existsSync } from "node:fs";
-import { dirname, join, sep } from "node:path";
+import { join } from "node:path";
 
 import betterTailwindcss from "eslint-plugin-better-tailwindcss";
 
-const findEntryPoint = (start) => {
-  let dir = start;
-  while (dir !== dirname(dir)) {
-    if (!dir.split(sep).includes("node_modules")) {
-      const candidate = join(dir, "src/app/globals.css");
-      if (existsSync(candidate)) {
-        return candidate;
-      }
-    }
-    dir = dirname(dir);
-  }
-  return "src/app/globals.css";
-};
+import { findUp } from "../common/_internal/find-up.mjs";
 
-const entryPoint = findEntryPoint(import.meta.dirname);
+const entryPoint = findUp(
+  import.meta.dirname,
+  (dir) => {
+    const candidate = join(dir, "src/app/globals.css");
+    return existsSync(candidate) ? candidate : null;
+  },
+  "src/app/globals.css",
+);
 
 export const tailwindcssConfigs = [
   {

package/src/next/boundaries/components.mjs

@@ -1,36 +0,0 @@
-import {
-  LIB_BOUNDARY_PATTERNS,
-  MAPPING_PATTERNS,
-} from "../../common/_internal/import-patterns.mjs";
-
-const COMPONENTS_BOUNDARY_PATTERNS = [
-  {
-    group: ["**/queries/*", "**/queries"],
-    message:
-      "components は queries を直接 import 不可。entries か hooks 経由で使う。",
-  },
-  {
-    group: ["**/services/*", "**/services"],
-    message:
-      "components は services を直接 import 不可。entries か hooks 経由で使う。",
-  },
-];
-
-export const componentsBoundaryConfigs = [
-  {
-    name: "imports/components-boundary",
-    files: ["src/components/**/*.{ts,tsx}"],
-    rules: {
-      "no-restricted-imports": [
-        "error",
-        {
-          patterns: [
-            ...COMPONENTS_BOUNDARY_PATTERNS,
-            ...LIB_BOUNDARY_PATTERNS,
-            ...MAPPING_PATTERNS,
-          ],
-        },
-      ],
-    },
-  },
-];

package/src/next/boundaries/hooks.mjs

@@ -1,36 +0,0 @@
-import {
-  LIB_BOUNDARY_PATTERNS,
-  MAPPING_PATTERNS,
-} from "../../common/_internal/import-patterns.mjs";
-
-const HOOKS_BOUNDARY_PATTERNS = [
-  {
-    group: ["**/queries/*", "**/queries"],
-    message:
-      "hooks は queries を直接 import 不可。entries 経由で使う。",
-  },
-  {
-    group: ["**/services/*", "**/services"],
-    message:
-      "hooks は services を直接 import 不可。entries 経由で使う。",
-  },
-];
-
-export const hooksBoundaryConfigs = [
-  {
-    name: "imports/hooks-boundary",
-    files: ["src/features/**/hooks/*.ts"],
-    rules: {
-      "no-restricted-imports": [
-        "error",
-        {
-          patterns: [
-            ...HOOKS_BOUNDARY_PATTERNS,
-            ...LIB_BOUNDARY_PATTERNS,
-            ...MAPPING_PATTERNS,
-          ],
-        },
-      ],
-    },
-  },
-];

package/src/next/boundaries/page.mjs

@@ -1,36 +0,0 @@
-import {
-  LIB_BOUNDARY_PATTERNS,
-  MAPPING_PATTERNS,
-} from "../../common/_internal/import-patterns.mjs";
-
-const PAGE_BOUNDARY_PATTERNS = [
-  {
-    group: ["**/queries/*", "**/queries"],
-    message:
-      "page.tsx は queries を直接 import 不可。entries 経由で使う。",
-  },
-  {
-    group: ["**/services/*", "**/services"],
-    message:
-      "page.tsx は services を直接 import 不可。entries 経由で使う。",
-  },
-];
-
-export const pageBoundaryConfigs = [
-  {
-    name: "imports/page-boundary",
-    files: ["src/app/**/page.tsx"],
-    rules: {
-      "no-restricted-imports": [
-        "error",
-        {
-          patterns: [
-            ...PAGE_BOUNDARY_PATTERNS,
-            ...LIB_BOUNDARY_PATTERNS,
-            ...MAPPING_PATTERNS,
-          ],
-        },
-      ],
-    },
-  },
-];

package/src/next/boundaries/route.mjs

@@ -1,36 +0,0 @@
-import {
-  LIB_BOUNDARY_PATTERNS,
-  MAPPING_PATTERNS,
-} from "../../common/_internal/import-patterns.mjs";
-
-const ROUTE_BOUNDARY_PATTERNS = [
-  {
-    group: ["**/queries/*", "**/queries"],
-    message:
-      "route.ts は queries を直接 import 不可。entries 経由で使う。",
-  },
-  {
-    group: ["**/services/*", "**/services"],
-    message:
-      "route.ts は services を直接 import 不可。entries 経由で使う。",
-  },
-];
-
-export const routeBoundaryConfigs = [
-  {
-    name: "imports/route-boundary",
-    files: ["src/app/**/route.ts"],
-    rules: {
-      "no-restricted-imports": [
-        "error",
-        {
-          patterns: [
-            ...ROUTE_BOUNDARY_PATTERNS,
-            ...LIB_BOUNDARY_PATTERNS,
-            ...MAPPING_PATTERNS,
-          ],
-        },
-      ],
-    },
-  },
-];

package/src/next/boundaries/sitemap.mjs

@@ -1,36 +0,0 @@
-import {
-  LIB_BOUNDARY_PATTERNS,
-  MAPPING_PATTERNS,
-} from "../../common/_internal/import-patterns.mjs";
-
-const SITEMAP_BOUNDARY_PATTERNS = [
-  {
-    group: ["**/queries/*", "**/queries"],
-    message:
-      "sitemap.ts は queries を直接 import 不可。entries 経由で使う。",
-  },
-  {
-    group: ["**/services/*", "**/services"],
-    message:
-      "sitemap.ts は services を直接 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,
-          ],
-        },
-      ],
-    },
-  },
-];