@ffflorian/auto-merge 1.2.1 → 1.3.1

package/dist/AutoMerge.d.ts

@@ -1,8 +1,9 @@
 import type { AutoMergeConfig, ActionResult, Repository, RepositoryResult } from './types/index.js';
 export declare class AutoMerge {
-    private readonly apiClient;
+    private readonly baseHeaders;
     private readonly config;
     private readonly logger;
+    private readonly baseURL;
     constructor(config: AutoMergeConfig);
     private checkConfig;
     private checkRepositorySlug;

package/dist/AutoMerge.js

@@ -1,6 +1,5 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import axios from 'axios';
 import logdown from 'logdown';
 const __dirname = import.meta.dirname;
 const packageJsonPath = path.join(__dirname, '../package.json');
@@ -14,14 +13,12 @@ export class AutoMerge {
             markdown: false,
         });
         this.logger.state.isEnabled = true;
-        this.apiClient = axios.create({
-            baseURL: 'https://api.github.com',
-            headers: {
-                Accept: 'application/vnd.github+json',
-                Authorization: `token ${this.config.authToken}`,
-                'User-Agent': `${toolName} v${toolVersion}`,
-            },
-        });
+        this.baseURL = 'https://api.github.com';
+        this.baseHeaders = {
+            Accept: 'application/vnd.github+json',
+            Authorization: `token ${this.config.authToken}`,
+            'User-Agent': `${toolName} v${toolVersion}`,
+        };
         this.checkConfig(this.config);
     }
     checkConfig(config) {
@@ -67,9 +64,12 @@ export class AutoMerge {
         return matchingRepositories;
     }
     async isPullRequestMergeable(repositorySlug, pullNumber) {
-        const resourceUrl = `/repos/${repositorySlug}/pulls/${pullNumber}`;
-        const response = await this.apiClient.get(resourceUrl);
-        return response.data.mergeable_state === 'clean';
+        const resourceUrl = new URL(`/repos/${repositorySlug}/pulls/${pullNumber}`, this.baseURL);
+        const response = await fetch(resourceUrl, { headers: this.baseHeaders });
+        if (!response.ok) {
+            throw new Error(`Error while checking merge request: ${response.statusText}`);
+        }
+        return (await response.json()).mergeable_state === 'clean';
     }
     async mergeByMatch(regex, repositories) {
         const allRepositories = repositories || (await this.getRepositoriesWithOpenPullRequests());
@@ -137,18 +137,31 @@ export class AutoMerge {
     }
     /** @see https://docs.github.com/en/rest/reference/pulls#create-a-review-for-a-pull-request */
     async postReview(repositorySlug, pullNumber) {
-        const resourceUrl = `/repos/${repositorySlug}/pulls/${pullNumber}/reviews`;
-        await this.apiClient.post(resourceUrl, { event: 'APPROVE' });
+        const resourceUrl = new URL(`/repos/${repositorySlug}/pulls/${pullNumber}/reviews`, this.baseURL);
+        resourceUrl.search = new URLSearchParams({ event: 'APPROVE' }).toString();
+        const response = await fetch(resourceUrl, { headers: this.baseHeaders, method: 'POST' });
+        if (!response.ok) {
+            throw new Error(`Error while approving pull request: ${response.statusText}`);
+        }
     }
     /** @see https://docs.github.com/en/rest/reference/issues#create-an-issue-comment */
     async putMerge(repositorySlug, pullNumber, squash) {
-        const resourceUrl = `/repos/${repositorySlug}/pulls/${pullNumber}/merge`;
-        await this.apiClient.put(resourceUrl, squash ? { merge_method: 'squash' } : undefined);
+        const resourceUrl = new URL(`/repos/${repositorySlug}/pulls/${pullNumber}/merge`, this.baseURL);
+        if (squash) {
+            resourceUrl.search = new URLSearchParams({ merge_method: 'squash' }).toString();
+        }
+        const response = await fetch(resourceUrl, { headers: this.baseHeaders, method: 'PUT' });
+        if (!response.ok) {
+            throw new Error(`Error while merging pull request: ${response.statusText}`);
+        }
     }
     async getPullRequestsBySlug(repositorySlug) {
-        const resourceUrl = `/repos/${repositorySlug}/pulls`;
-        const params = { per_page: 100, state: 'open' };
-        const response = await this.apiClient.get(resourceUrl, { params });
-        return response.data;
+        const resourceUrl = new URL(`/repos/${repositorySlug}/pulls`, this.baseURL);
+        resourceUrl.search = new URLSearchParams({ per_page: '100', state: 'open' }).toString();
+        const response = await fetch(resourceUrl, { headers: this.baseHeaders });
+        if (!response.ok) {
+            throw new Error(`Error while fetching pull requests: ${response.statusText}`);
+        }
+        return response.json();
     }
 }

package/package.json

@@ -2,7 +2,6 @@
   "author": "Florian Imdahl <git@ffflorian.de>",
   "bin": "dist/cli.js",
   "dependencies": {
-    "axios": "1.13.2",
     "commander": "14.0.2",
     "cosmiconfig": "9.0.0",
     "logdown": "3.3.1"
@@ -32,13 +31,13 @@
   "name": "@ffflorian/auto-merge",
   "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/auto-merge",
   "scripts": {
-    "build": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.build.json",
     "clean": "rimraf dist",
     "dist": "yarn clean && yarn build",
     "start": "tsx src/cli.ts",
     "test": "vitest run"
   },
   "type": "module",
-  "version": "1.2.1",
-  "gitHead": "eedb2984fd69190a0b69a992d18fe451e714e04d"
+  "version": "1.3.1",
+  "gitHead": "624bfac36e769ed7157fe9a9ada1c3e5443745ff"
 }

package/dist/AutoMerge.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/AutoMerge.test.js

@@ -1,109 +0,0 @@
-import { expect, describe, test, beforeEach, afterEach, vi } from 'vitest';
-import nock from 'nock';
-import { StatusCodes as HTTP_STATUS } from 'http-status-codes';
-import { AutoMerge } from './AutoMerge.js';
-describe('AutoMerge', () => {
-    describe('checkRepository', () => {
-        let autoMerge;
-        const validRepositoryNames = ['ffflorian/example-project-1', 'my-name/my_great-project42342'];
-        const repositories = [
-            {
-                pullRequests: [
-                    {
-                        draft: false,
-                        head: {
-                            ref: 'dependabot/npm_and_yarn/eslint-plugin-typescript-sort-keys-1.5.0',
-                            sha: 'cd3ae10104a2ed9d937869b892457003ad68df74',
-                        },
-                        number: 253,
-                        title: 'chore: bump eslint-plugin-typescript-sort-keys from 1.3.0 to 1.5.0',
-                    },
-                ],
-                repositorySlug: validRepositoryNames[0],
-            },
-            {
-                pullRequests: [
-                    {
-                        draft: false,
-                        head: {
-                            ref: 'dependabot/npm_and_yarn/typescript-4.0.3',
-                            sha: 'e59a374b357763fab5d3e61b0fdab66f4746b097',
-                        },
-                        number: 252,
-                        title: 'chore: bump typescript from 4.0.2 to 4.0.3',
-                    },
-                ],
-                repositorySlug: validRepositoryNames[1],
-            },
-        ];
-        beforeEach(() => {
-            autoMerge = new AutoMerge({
-                authToken: 'example-token',
-                projects: {
-                    gitHub: validRepositoryNames,
-                },
-            });
-            nock(autoMerge['apiClient'].defaults.baseURL)
-                .post(/^\/repos\/.+?\/.+?\/pulls\/\d+\/reviews\/?$/)
-                .reply(HTTP_STATUS.OK, { data: 'not-used' })
-                .persist();
-            nock(autoMerge['apiClient'].defaults.baseURL)
-                .get(/^\/repos\/.+?\/.+?\/pulls\/\d+\/?$/)
-                .reply(HTTP_STATUS.OK, { data: 'not-used' })
-                .persist();
-            nock(autoMerge['apiClient'].defaults.baseURL)
-                .put(/^\/repos\/.+?\/.+?\/pulls\/\d+\/merge\/?$/)
-                .reply(HTTP_STATUS.OK, { data: 'not-used' })
-                .persist();
-        });
-        afterEach(() => {
-            nock.cleanAll();
-        });
-        test('detects valid repository names', () => {
-            validRepositoryNames.forEach(repositoryName => {
-                const checkResult = autoMerge['checkRepositorySlug'](repositoryName);
-                expect(checkResult).toBe(true);
-            });
-        });
-        test('detects invalid repository names', () => {
-            const invalidRepositoryNames = [
-                'invalid-username--/valid-project-name',
-                'valid-username/invalid-project-name-',
-                'no-project-name',
-                'in(valid-username/valid-project-name',
-                'valid-username/invalid!project-name',
-            ];
-            invalidRepositoryNames.forEach(repositoryName => {
-                const checkResult = autoMerge['checkRepositorySlug'](repositoryName);
-                expect(checkResult).toBe(false);
-            });
-        });
-        describe('getMatchingRepositories', () => {
-            test('matches repositories', () => {
-                const expectedESLint = [repositories[0]];
-                const actualESLint = autoMerge['getMatchingRepositories'](repositories, /eslint/gi);
-                expect(actualESLint).toEqual(expectedESLint);
-                const expectedTypeScript = [repositories[1]];
-                const actualTypeScript = autoMerge['getMatchingRepositories'](repositories, /typescript-4.0.3/gi);
-                expect(actualTypeScript).toEqual(expectedTypeScript);
-                const expectedAll = repositories;
-                const actualAll = autoMerge['getMatchingRepositories'](repositories, /typescript/gi);
-                expect(actualAll).toEqual(expectedAll);
-                const expectedNone = [];
-                const actualNone = autoMerge['getMatchingRepositories'](repositories, /no-match/gi);
-                expect(actualNone).toEqual(expectedNone);
-            });
-        });
-        describe('mergeByMatch', () => {
-            test('merge matching PRs', async () => {
-                vi.spyOn(autoMerge, 'putMerge');
-                await autoMerge.mergeByMatch(/eslint/gi, repositories);
-                const expectedRepositoryESLint = repositories[0];
-                expect(autoMerge['putMerge']).toHaveBeenCalledWith(expectedRepositoryESLint.repositorySlug, expectedRepositoryESLint.pullRequests[0].number, false);
-                await autoMerge.mergeByMatch(/typescript-4.0.3/gi, repositories);
-                const expectedRepositoryTypescript = repositories[1];
-                expect(autoMerge['putMerge']).toHaveBeenCalledWith(expectedRepositoryTypescript.repositorySlug, expectedRepositoryTypescript.pullRequests[0].number, false);
-            });
-        });
-    });
-});