Merge pull request #246 from ysk8hori/fix-await

fix: コメントに [object: Promise] と投稿される件を修正

Author: ysk8hori

.github/workflows/test-dummy_project.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Delta Typescript Graph
         id: tsg
-        uses: ysk8hori/delta-typescript-graph-action@8ca233742696fdeadc7e057ff1772f8bd354d437
+        uses: ysk8hori/delta-typescript-graph-action@44b8652261a2d95e733bdc7068bde410ab7df09f
         with:
           access-token: ${{ secrets.GITHUB_TOKEN }}
           tsconfig: './dummy_project/tsconfig-dummy.json'

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

@@ -11,6 +11,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: ysk8hori/delta-typescript-graph-action@8ca233742696fdeadc7e057ff1772f8bd354d437
+      - uses: ysk8hori/delta-typescript-graph-action@44b8652261a2d95e733bdc7068bde410ab7df09f
         with:
           max-size: 50

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

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Delta Typescript Graph
         id: tsg
-        uses: ysk8hori/delta-typescript-graph-action@8ca233742696fdeadc7e057ff1772f8bd354d437
+        uses: ysk8hori/delta-typescript-graph-action@44b8652261a2d95e733bdc7068bde410ab7df09f
         with:
           access-token: ${{ secrets.GITHUB_TOKEN }}
           tsconfig-root: './'

dist/index.js

@@ -237868,15 +237868,6 @@ function applyMutualDifferences(fullBaseGraph, fullHeadGraph, context) {
 
 "use strict";
 
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -237889,26 +237880,24 @@ const applyMutualDifferences_1 = __importDefault(__nccwpck_require__(57938));
  * ファイルの削除またはリネームがある場合は Graph を2つ表示する
  */
 function build2GraphsMessage(fullBaseGraph, fullHeadGraph, context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { baseGraph, headGraph, tsgCommand } = (0, applyMutualDifferences_1.default)(fullBaseGraph, fullHeadGraph, context);
-        if (baseGraph.nodes.length === 0 && headGraph.nodes.length === 0) {
-            // base と head のグラフが空の場合は表示しない
-            return 'The graph is empty.\n\n';
-        }
-        if (baseGraph.nodes.length > (0, config_1.getMaxSize)() ||
-            headGraph.nodes.length > (0, config_1.getMaxSize)()) {
-            // base または head のグラフが大きすぎる場合は表示しない
-            return buildGraphSizeExceededMessage(baseGraph, headGraph, tsgCommand);
-        }
-        // base の書き出し
-        const baseLines = [];
-        const orientation = (0, config_1.getOrientation)();
-        yield (0, typescript_graph_1.mermaidify)((arg) => baseLines.push(arg), baseGraph, orientation);
-        // head の書き出し
-        const headLines = [];
-        yield (0, typescript_graph_1.mermaidify)((arg) => headLines.push(arg), headGraph, orientation);
-        return buildNormal2GraphMessage(tsgCommand, baseLines, headLines);
-    });
+    const { baseGraph, headGraph, tsgCommand } = (0, applyMutualDifferences_1.default)(fullBaseGraph, fullHeadGraph, context);
+    if (baseGraph.nodes.length === 0 && headGraph.nodes.length === 0) {
+        // base と head のグラフが空の場合は表示しない
+        return 'The graph is empty.\n\n';
+    }
+    if (baseGraph.nodes.length > (0, config_1.getMaxSize)() ||
+        headGraph.nodes.length > (0, config_1.getMaxSize)()) {
+        // base または head のグラフが大きすぎる場合は表示しない
+        return buildGraphSizeExceededMessage(baseGraph, headGraph, tsgCommand);
+    }
+    // base の書き出し
+    const baseLines = [];
+    const orientation = (0, config_1.getOrientation)();
+    (0, typescript_graph_1.mermaidify)((arg) => baseLines.push(arg), baseGraph, orientation);
+    // head の書き出し
+    const headLines = [];
+    (0, typescript_graph_1.mermaidify)((arg) => headLines.push(arg), headGraph, orientation);
+    return buildNormal2GraphMessage(tsgCommand, baseLines, headLines);
 }
 function buildNormal2GraphMessage(tsgCommand, baseLines, headLines) {
     return `

src/graph/__snapshots__/output2Graphs.test.ts.snap

@@ -30,7 +30,7 @@ const e: Node = {
   changeStatus: 'not_modified',
 };
 
-test('削除がある場合', async () => {
+test('削除がある場合', () => {
   const base: Graph = {
     nodes: [a, b, c, d, e],
     relations: [
@@ -84,7 +84,7 @@ test('削除がある場合', async () => {
     ],
   };
   const context = getDummyContext();
-  const result = await build2GraphsMessage(base, head, {
+  const result = build2GraphsMessage(base, head, {
     ...context,
     filesChanged: {
       created: [],

src/graph/__snapshots__/outputGraph.test.ts.snap

@@ -7,11 +7,11 @@ import applyMutualDifferences from './applyMutualDifferences';
 /**
  * ファイルの削除またはリネームがある場合は Graph を2つ表示する
  */
-export async function build2GraphsMessage(
+export function build2GraphsMessage(
   fullBaseGraph: Graph,
   fullHeadGraph: Graph,
   context: Context,
-): Promise<string> {
+): string {
   const { baseGraph, headGraph, tsgCommand } = applyMutualDifferences(
     fullBaseGraph,
     fullHeadGraph,
@@ -34,19 +34,11 @@ export async function build2GraphsMessage(
   // base の書き出し
   const baseLines: string[] = [];
   const orientation = getOrientation();
-  await mermaidify(
-    (arg: string) => baseLines.push(arg),
-    baseGraph,
-    orientation,
-  );
+  mermaidify((arg: string) => baseLines.push(arg), baseGraph, orientation);
 
   // head の書き出し
   const headLines: string[] = [];
-  await mermaidify(
-    (arg: string) => headLines.push(arg),
-    headGraph,
-    orientation,
-  );
+  mermaidify((arg: string) => headLines.push(arg), headGraph, orientation);
 
   return buildNormal2GraphMessage(tsgCommand, baseLines, headLines);
 }

src/graph/build2GraphsMessage.test.ts

@@ -30,17 +30,17 @@ const e: Node = {
   changeStatus: 'not_modified',
 };
 
-test('出力可能なグラフがない場合は何も出力しない', async () => {
+test('出力可能なグラフがない場合は何も出力しない', () => {
   const graph = {
     nodes: [],
     relations: [],
   };
   const context = getDummyContext();
-  const message = await buildGraphMessage(graph, graph, context);
+  const message = buildGraphMessage(graph, graph, context);
   expect(message).toBe('The graph is empty.\n\n');
 });
 
-test('グラフが大きすぎる場合はその旨を出力する', async () => {
+test('グラフが大きすぎる場合はその旨を出力する', () => {
   const graphA: Graph = {
     nodes: [a, c, d, e],
     relations: [
@@ -88,7 +88,7 @@ test('グラフが大きすぎる場合はその旨を出力する', async () =>
     ],
   };
   const context = getDummyContext();
-  const message = await buildGraphMessage(graphA, graphB, {
+  const message = buildGraphMessage(graphA, graphB, {
     ...context,
     config: { ...context.config, maxSize: 1 },
     filesChanged: {
@@ -105,7 +105,7 @@ test('グラフが大きすぎる場合はその旨を出力する', async () =>
   expect(message).toMatchSnapshot();
 });
 
-test('追加や依存の削除がある場合', async () => {
+test('追加や依存の削除がある場合', () => {
   const graphA: Graph = {
     nodes: [a, c, d, e],
     relations: [
@@ -153,7 +153,7 @@ test('追加や依存の削除がある場合', async () => {
     ],
   };
   const context = getDummyContext();
-  const message = await buildGraphMessage(graphA, graphB, {
+  const message = buildGraphMessage(graphA, graphB, {
     ...context,
     filesChanged: {
       created: [