Merge pull request #14 from ysk8hori/12-duplicate-exclude-node_modules

fix: tsgコマンドのexcludeにnode_modulesが2つ出力される件を修正

Author: ysk8hori

.github/workflows/test-no-params.yml

@@ -11,4 +11,4 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: ysk8hori/delta-typescript-graph-action@5ff73e88adec73915862a2d2c0080b9196e3a9f7
+      - uses: ysk8hori/delta-typescript-graph-action@71cfddc120d657edf7c951f4f7fd9db5cd080410

.github/workflows/test-with-params.yml

@@ -13,13 +13,13 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Delta Typescript Graph
         id: tsg
-        uses: ysk8hori/delta-typescript-graph-action@5ff73e88adec73915862a2d2c0080b9196e3a9f7
+        uses: ysk8hori/delta-typescript-graph-action@71cfddc120d657edf7c951f4f7fd9db5cd080410
         with:
           access-token: ${{ secrets.GITHUB_TOKEN }}
           tsconfig-root: './src'
           max-size: 3
           orientation: LR
           debug: true
           in-details: true
-          exclude: 'node_modules, test'
+          exclude: 'test'
           include-index-file-dependencies: true

dist/index.js

@@ -216404,7 +216404,7 @@ function applyMutualDifferences(created, deleted, modified, renamed, fullBaseGra
     (0, log_1.log)('includes:', includes);
     const abstractionTargetsForBase = (0, remeda_1.pipe)(includes, extractNoAbstractionDirs_1.default, dirs => (0, extractAbstractionTarget_1.default)(dirs, fullBaseGraph));
     (0, log_1.log)('abstractionTargetsForBase:', abstractionTargetsForBase);
-    const baseGraph = (0, remeda_1.pipe)(fullBaseGraph, graph => (0, filterGraph_1.filterGraph)(includes, ['node_modules', ...(0, config_1.exclude)()], graph), graph => ((0, log_1.log)('filtered base graph.nodes.length:', graph.nodes.length),
+    const baseGraph = (0, remeda_1.pipe)(fullBaseGraph, graph => (0, filterGraph_1.filterGraph)(includes, (0, config_1.exclude)(), graph), graph => ((0, log_1.log)('filtered base graph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('filtered base graph.relations.length:', graph.relations.length),
         graph), graph => (0, abstraction_1.abstraction)(abstractionTargetsForBase, graph), graph => ((0, log_1.log)('abstracted base graph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('abstracted base graph.relations.length:', graph.relations.length),
@@ -216413,7 +216413,7 @@ function applyMutualDifferences(created, deleted, modified, renamed, fullBaseGra
     (0, log_1.log)('baseGraph.relations.length:', baseGraph.relations.length);
     const abstractionTargetsForHead = (0, remeda_1.pipe)(includes, extractNoAbstractionDirs_1.default, dirs => (0, extractAbstractionTarget_1.default)(dirs, fullHeadGraph));
     (0, log_1.log)('abstractionTargetsForHead:', abstractionTargetsForHead);
-    const headGraph = (0, remeda_1.pipe)(fullHeadGraph, graph => (0, filterGraph_1.filterGraph)(includes, ['node_modules', ...(0, config_1.exclude)()], graph), graph => ((0, log_1.log)('filtered head graph.nodes.length:', graph.nodes.length),
+    const headGraph = (0, remeda_1.pipe)(fullHeadGraph, graph => (0, filterGraph_1.filterGraph)(includes, (0, config_1.exclude)(), graph), graph => ((0, log_1.log)('filtered head graph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('filtered head graph.relations.length:', graph.relations.length),
         graph), graph => (0, abstraction_1.abstraction)(abstractionTargetsForHead, graph), graph => ((0, log_1.log)('abstracted head graph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('abstracted head graph.relations.length:', graph.relations.length),
@@ -216422,7 +216422,7 @@ function applyMutualDifferences(created, deleted, modified, renamed, fullBaseGra
     (0, log_1.log)('headGraph.relations.length:', headGraph.relations.length);
     const tsgCommand = (0, createTsgCommand_1.createTsgCommand)({
         includes,
-        excludes: ['node_modules', ...(0, config_1.exclude)()],
+        excludes: (0, config_1.exclude)(),
         abstractions: (0, extractAbstractionTargetFromGraphs_1.extractAbstractionTargetFromGraphs)(baseGraph, headGraph),
     });
     return { baseGraph, headGraph, tsgCommand };
@@ -216713,7 +216713,7 @@ function mergeGraphsWithDifferences(fullBaseGraph, fullHeadGraph, created, delet
     (0, log_1.log)('includes:', includes);
     const abstractionTarget = (0, remeda_1.pipe)(includes, extractNoAbstractionDirs_1.default, dirs => (0, extractAbstractionTarget_1.default)(dirs, mergedGraph));
     (0, log_1.log)('abstractionTarget:', abstractionTarget);
-    const graph = (0, remeda_1.pipe)(mergedGraph, graph => (0, filterGraph_1.filterGraph)(includes, ['node_modules', ...(0, config_1.exclude)()], graph), graph => ((0, log_1.log)('filteredGraph.nodes.length:', graph.nodes.length),
+    const graph = (0, remeda_1.pipe)(mergedGraph, graph => (0, filterGraph_1.filterGraph)(includes, (0, config_1.exclude)(), graph), graph => ((0, log_1.log)('filteredGraph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('filteredGraph.relations.length:', graph.relations.length),
         graph), graph => (0, abstraction_1.abstraction)(abstractionTarget, graph), graph => ((0, log_1.log)('abstractedGraph.nodes.length:', graph.nodes.length),
         (0, log_1.log)('abstractedGraph.relations.length:', graph.relations.length),
@@ -216722,7 +216722,7 @@ function mergeGraphsWithDifferences(fullBaseGraph, fullHeadGraph, created, delet
         graph));
     const tsgCommand = (0, createTsgCommand_1.createTsgCommand)({
         includes,
-        excludes: ['node_modules', ...(0, config_1.exclude)()],
+        excludes: (0, config_1.exclude)(),
         abstractions: (0, extractAbstractionTargetFromGraphs_1.extractAbstractionTargetFromGraphs)(graph),
     });
     return { graph, tsgCommand };
@@ -217038,6 +217038,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.isIncludeIndexFileDependencies = exports.exclude = exports.isInDetails = exports.isDebugEnabled = exports.getOrientation = exports.getMaxSize = exports.getTsconfigRoot = void 0;
 const core = __importStar(__nccwpck_require__(2186));
+const reducer_1 = __nccwpck_require__(2021);
 /** tsconfig のルートディレクトリ */
 const TSCONFIG_ROOT = 'tsconfig-root';
 /** 変更ファイル数が多い場合にグラフの表示を抑止するが、その際のノード数を指定する値 */
@@ -217097,7 +217098,9 @@ function exclude() {
         .getInput(EXCLUDE)
         .split(',')
         .map(s => s.trim())
-        .filter(Boolean);
+        .filter(Boolean)
+        .with(0, 'node_modules') // デフォルトで node_modules を含める
+        .reduce(reducer_1.uniqueString, []);
 }
 exports.exclude = exclude;
 /** 変更対象のファイルが同階層の index.ts などから参照されている場合、その index.ts への依存ファイルも表示するかどうか */

src/graph/applyMutualDifferences.ts

@@ -43,7 +43,7 @@ export default function applyMutualDifferences(
   log('abstractionTargetsForBase:', abstractionTargetsForBase);
   const baseGraph = pipe(
     fullBaseGraph,
-    graph => filterGraph(includes, ['node_modules', ...exclude()], graph),
+    graph => filterGraph(includes, exclude(), graph),
     graph => (
       log('filtered base graph.nodes.length:', graph.nodes.length),
       log('filtered base graph.relations.length:', graph.relations.length),
@@ -68,7 +68,7 @@ export default function applyMutualDifferences(
   log('abstractionTargetsForHead:', abstractionTargetsForHead);
   const headGraph = pipe(
     fullHeadGraph,
-    graph => filterGraph(includes, ['node_modules', ...exclude()], graph),
+    graph => filterGraph(includes, exclude(), graph),
     graph => (
       log('filtered head graph.nodes.length:', graph.nodes.length),
       log('filtered head graph.relations.length:', graph.relations.length),
@@ -87,7 +87,7 @@ export default function applyMutualDifferences(
 
   const tsgCommand = createTsgCommand({
     includes,
-    excludes: ['node_modules', ...exclude()],
+    excludes: exclude(),
     abstractions: extractAbstractionTargetFromGraphs(baseGraph, headGraph),
   });
 

src/graph/mergeGraphsWithDifferences.ts

@@ -52,7 +52,7 @@ export default function mergeGraphsWithDifferences(
 
   const graph = pipe(
     mergedGraph,
-    graph => filterGraph(includes, ['node_modules', ...exclude()], graph),
+    graph => filterGraph(includes, exclude(), graph),
     graph => (
       log('filteredGraph.nodes.length:', graph.nodes.length),
       log('filteredGraph.relations.length:', graph.relations.length),
@@ -74,7 +74,7 @@ export default function mergeGraphsWithDifferences(
 
   const tsgCommand = createTsgCommand({
     includes,
-    excludes: ['node_modules', ...exclude()],
+    excludes: exclude(),
     abstractions: extractAbstractionTargetFromGraphs(graph),
   });
 

src/utils/.test-danger-tsgrc.json

@@ -1,5 +1,6 @@
 import type mermaidify from '@ysk8hori/typescript-graph/dist/src/mermaidify';
 import * as core from '@actions/core';
+import { uniqueString } from './reducer';
 
 /** tsconfig のルートディレクトリ */
 const TSCONFIG_ROOT = 'tsconfig-root';
@@ -63,7 +64,9 @@ export function exclude(): string[] {
     .getInput(EXCLUDE)
     .split(',')
     .map(s => s.trim())
-    .filter(Boolean);
+    .filter(Boolean)
+    .with(0, 'node_modules') // デフォルトで node_modules を含める
+    .reduce(uniqueString, []);
 }
 
 /** 変更対象のファイルが同階層の index.ts などから参照されている場合、その index.ts への依存ファイルも表示するかどうか */