finish up

Author: danadajian

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

bun.lock

@@ -21,6 +21,7 @@
         "simple-git": "3.28.0",
       },
       "devDependencies": {
+        "@octokit/webhooks-types": "7.6.1",
         "@swc/jest": "0.2.39",
         "@total-typescript/ts-reset": "0.6.1",
         "@types/bluebird": "3.5.42",
@@ -265,6 +266,8 @@
 
     "@octokit/types": ["@octokit/[email protected]", "", { "dependencies": { "@octokit/openapi-types": "^22.2.0" } }, "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ=="],
 
+    "@octokit/webhooks-types": ["@octokit/[email protected]", "", {}, "sha512-S8u2cJzklBC0FgTwWVLaM8tMrDuDMVE4xiTK4EYXM9GntyvrdbSoxqDQa+Fh57CCNApyIpyeqPhhFEmHPfrXgw=="],
+
     "@pkgjs/parseargs": ["@pkgjs/[email protected]", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="],
 
     "@pkgr/core": ["@pkgr/[email protected]", "", {}, "sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg=="],

dist/813.index.js

@@ -22,6 +22,7 @@
     "simple-git": "3.28.0"
   },
   "devDependencies": {
+    "@octokit/webhooks-types": "7.6.1",
     "@swc/jest": "0.2.39",
     "@total-typescript/ts-reset": "0.6.1",
     "@types/bluebird": "3.5.42",

dist/813.index.js.map

@@ -12,8 +12,24 @@ limitations under the License.
 */
 
 import { context } from '@actions/github';
-import { info } from '@actions/core';
+import { error } from '@actions/core';
+import { PushEvent } from '@octokit/webhooks-types';
 
-export const createBatchedCommitMessage = async () => {
-  info(JSON.stringify(context.payload));
+export const createBatchedCommitMessage = () => {
+  const eventPayload = context.payload as PushEvent;
+  if (!('commits' in eventPayload)) {
+    error('No commits found in the event payload.');
+    return;
+  }
+  return eventPayload.commits
+    .map(commit => {
+      const prNumberMatch = commit.message.match(/\(#(\d+)\)/)?.[0] ?? '';
+      const messageWithoutPrNumber = commit.message.replace(prNumberMatch, '').trim();
+      const truncatedMessage = messageWithoutPrNumber.slice(0, 50);
+      if (truncatedMessage.length < messageWithoutPrNumber.length) {
+        return `${truncatedMessage}... ${prNumberMatch ?? 'PR unknown'}`;
+      }
+      return commit.message;
+    })
+    .join(' and ');
 };

package.json

@@ -27,8 +27,6 @@ export type SinglePullRequest = PullRequestList[number];
 export type IssueLabels = IssueList[number]['labels'];
 export type PullRequestBranchesList = RestEndpointMethodTypes['repos']['listBranches']['response']['data'];
 export type ChangedFilesList = RestEndpointMethodTypes['pulls']['listFiles']['response']['data'];
-export type ProjectListResponse = RestEndpointMethodTypes['projects']['listForRepo']['response'];
-export type ColumnListResponse = RestEndpointMethodTypes['projects']['listColumns']['response'];
 export type ChecksUpdateConclusion = RestEndpointMethodTypes['checks']['update']['parameters']['conclusion'];
 export type MembersInOrg = RestEndpointMethodTypes['teams']['listMembersInOrg']['response']['data'];
 export type MembersInOrgParams = RestEndpointMethodTypes['teams']['listMembersInOrg']['parameters'];

src/helpers/create-batched-commit-message.ts

@@ -12,21 +12,53 @@ limitations under the License.
 */
 
 import { createBatchedCommitMessage } from '../../src/helpers/create-batched-commit-message';
+import { context } from '@actions/github';
 
 jest.mock('@actions/core');
 jest.mock('@actions/github', () => ({
-  context: { repo: { repo: 'repo', owner: 'owner' }, issue: { number: 123 } },
-  getOctokit: jest.fn(() => ({
-    rest: {}
-  }))
+  context: { payload: {} }
 }));
 
 describe('createBatchedCommitMessage', () => {
   beforeEach(() => {
-    createBatchedCommitMessage();
+    context.payload.commits = [
+      {
+        id: '1234567890abcdef',
+        message: 'Fix issue (#1)',
+        author: { name: 'John Doe', email: '' }
+      },
+      {
+        id: '1234567891abcdef',
+        message: 'Fix another issue (#2)',
+        author: { name: 'Jane Doe', email: '' }
+      }
+    ];
   });
+  it('should generate combined commit message', () => {
+    const result = createBatchedCommitMessage();
+    expect(result).toBe('Fix issue (#1) and Fix another issue (#2)');
+  });
+});
 
-  it('should pass', () => {
-    expect(false).toBe(true);
+describe('createBatchedCommitMessage', () => {
+  beforeEach(() => {
+    context.payload.commits = [
+      {
+        id: '1234567890abcdef',
+        message: 'Fix a really really really really really long issue (#1)',
+        author: { name: 'John Doe', email: '' }
+      },
+      {
+        id: '1234567891abcdef',
+        message: 'Fix another really really really really really long issue (#2)',
+        author: { name: 'Jane Doe', email: '' }
+      }
+    ];
+  });
+  it('should truncate the message', () => {
+    const result = createBatchedCommitMessage();
+    expect(result).toBe(
+      'Fix a really really really really really long issu... (#1) and Fix another really really really really really lon... (#2)'
+    );
   });
 });