@ffflorian/gh-open 3.6.4 → 3.6.5

package/dist/cjs/GitHubClient.js

@@ -1,36 +1,23 @@
-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());
-    });
-};
 import axios from 'axios';
 const TWO_SECONDS_IN_MILLIS = 2000;
 export class GitHubClient {
     constructor(timeout = TWO_SECONDS_IN_MILLIS) {
         this.apiClient = axios.create({ baseURL: 'https://api.github.com', timeout });
     }
-    getPullRequestByBranch(user, repository, branch) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pullRequests = yield this.getPullRequests(user, repository);
-            return pullRequests.find(pr => !!pr.head && pr.head.ref === branch);
-        });
+    async getPullRequestByBranch(user, repository, branch) {
+        const pullRequests = await this.getPullRequests(user, repository);
+        return pullRequests.find(pr => !!pr.head && pr.head.ref === branch);
     }
     /**
      * @see https://developer.github.com/v3/pulls/#list-pull-requests
      */
-    getPullRequests(user, repository) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const resourceUrl = `repos/${user}/${repository}/pulls`;
-            const response = yield this.apiClient.get(resourceUrl, {
-                params: {
-                    state: 'open',
-                },
-            });
-            return response.data;
+    async getPullRequests(user, repository) {
+        const resourceUrl = `repos/${user}/${repository}/pulls`;
+        const response = await this.apiClient.get(resourceUrl, {
+            params: {
+                state: 'open',
+            },
         });
+        return response.data;
     }
 }

package/dist/cjs/GitHubClient.test.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 import { assert, expect, describe, test } from 'vitest';
 import nock from 'nock';
 import { StatusCodes as HTTP_STATUS } from 'http-status-codes';
@@ -15,7 +6,7 @@ const TEN_SECONDS_IN_MILLIS = 10000;
 const HALF_SECOND_IN_MILLIS = 500;
 describe('GitHubClient', () => {
     describe('getPullRequests', () => {
-        test('cancels the request after a given time', () => __awaiter(void 0, void 0, void 0, function* () {
+        test('cancels the request after a given time', async () => {
             nock('https://api.github.com')
                 .get(/repos\/.*\/.*\/pulls/)
                 .query(true)
@@ -23,7 +14,7 @@ describe('GitHubClient', () => {
                 .reply(HTTP_STATUS.OK);
             const gitHubClient = new GitHubClient(HALF_SECOND_IN_MILLIS);
             try {
-                yield gitHubClient.getPullRequests('user', 'repository');
+                await gitHubClient.getPullRequests('user', 'repository');
                 assert.fail('Should not have resolved');
             }
             catch (error) {
@@ -32,10 +23,10 @@ describe('GitHubClient', () => {
             finally {
                 nock.cleanAll();
             }
-        }));
+        });
     });
     describe('getPullRequestsByBranch', () => {
-        test('correctly parses pull requests', () => __awaiter(void 0, void 0, void 0, function* () {
+        test('correctly parses pull requests', async () => {
             const exampleData = [
                 {
                     _links: {
@@ -53,8 +44,8 @@ describe('GitHubClient', () => {
                 .query(true)
                 .reply(HTTP_STATUS.OK, exampleData);
             const gitHubClient = new GitHubClient();
-            const result = yield gitHubClient.getPullRequestByBranch('user', 'repository', 'branch-name');
+            const result = await gitHubClient.getPullRequestByBranch('user', 'repository', 'branch-name');
             expect(result).toEqual(exampleData[0]);
-        }));
+        });
     });
 });

package/dist/cjs/RepositoryService.js

@@ -1,12 +1,3 @@
-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());
-    });
-};
 import { promises as fsAsync } from 'fs';
 import path from 'path';
 import logdown from 'logdown';
@@ -19,7 +10,7 @@ export class RepositoryService {
             pullRequest: new RegExp('github\\.com\\/(?<user>[^\\/]+)\\/(?<project>[^/]+)\\/tree\\/(?<branch>.*)'),
             rawUrl: new RegExp('.*url = (?<rawUrl>.*)', 'mi'),
         };
-        this.options = Object.assign({ debug: false, timeout: 2000 }, options);
+        this.options = { debug: false, timeout: 2000, ...options };
         this.gitHubClient = new GitHubClient(this.options.timeout);
         this.logger = logdown('gh-open', {
             logger: console,
@@ -27,83 +18,75 @@ export class RepositoryService {
         });
         this.logger.state.isEnabled = this.options.debug;
     }
-    getFullUrl(gitDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const rawUrl = yield this.parseGitConfig(gitDir);
-            const gitBranch = yield this.parseGitBranch(gitDir);
-            const match = this.parser.fullUrl.exec(rawUrl);
-            if (!match) {
-                const errorMessage = 'Could not convert raw URL.';
-                throw new Error(errorMessage);
-            }
-            const parsedUrl = rawUrl.replace(this.parser.fullUrl, 'https://$1/$2');
-            this.logger.info('Found parsed URL', { parsedUrl });
-            return `${parsedUrl}/tree/${gitBranch}`;
-        });
+    async getFullUrl(gitDir) {
+        const rawUrl = await this.parseGitConfig(gitDir);
+        const gitBranch = await this.parseGitBranch(gitDir);
+        const match = this.parser.fullUrl.exec(rawUrl);
+        if (!match) {
+            const errorMessage = 'Could not convert raw URL.';
+            throw new Error(errorMessage);
+        }
+        const parsedUrl = rawUrl.replace(this.parser.fullUrl, 'https://$1/$2');
+        this.logger.info('Found parsed URL', { parsedUrl });
+        return `${parsedUrl}/tree/${gitBranch}`;
     }
-    getPullRequestUrl(url) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const match = this.parser.pullRequest.exec(url);
-            if (!match || !match.groups) {
-                const errorMessage = `Could not convert GitHub URL "${url}" to pull request`;
-                throw new Error(errorMessage);
-            }
-            const { user, project, branch } = match.groups;
-            try {
-                const response = yield this.gitHubClient.getPullRequestByBranch(user, project, branch);
-                if (response && response._links && response._links.html && response._links.html.href) {
-                    const pullRequestUrl = response._links.html.href;
-                    this.logger.info('Got pull request URL', { pullRequestUrl });
-                    return pullRequestUrl;
-                }
-            }
-            catch (error) {
-                this.logger.warn(`Request failed: "${error.message}"`);
+    async getPullRequestUrl(url) {
+        const match = this.parser.pullRequest.exec(url);
+        if (!match || !match.groups) {
+            const errorMessage = `Could not convert GitHub URL "${url}" to pull request`;
+            throw new Error(errorMessage);
+        }
+        const { user, project, branch } = match.groups;
+        try {
+            const response = await this.gitHubClient.getPullRequestByBranch(user, project, branch);
+            if (response && response._links && response._links.html && response._links.html.href) {
+                const pullRequestUrl = response._links.html.href;
+                this.logger.info('Got pull request URL', { pullRequestUrl });
+                return pullRequestUrl;
             }
-        });
+        }
+        catch (error) {
+            this.logger.warn(`Request failed: "${error.message}"`);
+        }
     }
-    parseGitBranch(gitDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const gitHeadFile = path.join(gitDir, 'HEAD');
-            let gitHead;
-            try {
-                gitHead = yield fsAsync.readFile(gitHeadFile, 'utf-8');
-                gitHead = gitHead.trim();
-                this.logger.info('Read git head file', { gitHead });
-            }
-            catch (error) {
-                const errorMessage = `Could not find git HEAD file in "${gitDir}".`;
-                throw new Error(errorMessage);
-            }
-            const match = this.parser.gitBranch.exec(gitHead);
-            if (!match || !match.groups) {
-                const errorMessage = `No branch found in git HEAD file: "${gitHead}"`;
-                throw new Error(errorMessage);
-            }
-            return match.groups.branch;
-        });
+    async parseGitBranch(gitDir) {
+        const gitHeadFile = path.join(gitDir, 'HEAD');
+        let gitHead;
+        try {
+            gitHead = await fsAsync.readFile(gitHeadFile, 'utf-8');
+            gitHead = gitHead.trim();
+            this.logger.info('Read git head file', { gitHead });
+        }
+        catch (error) {
+            const errorMessage = `Could not find git HEAD file in "${gitDir}".`;
+            throw new Error(errorMessage);
+        }
+        const match = this.parser.gitBranch.exec(gitHead);
+        if (!match || !match.groups) {
+            const errorMessage = `No branch found in git HEAD file: "${gitHead}"`;
+            throw new Error(errorMessage);
+        }
+        return match.groups.branch;
     }
-    parseGitConfig(gitDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const gitConfigFile = path.join(gitDir, 'config');
-            let gitConfig;
-            try {
-                gitConfig = yield fsAsync.readFile(gitConfigFile, 'utf-8');
-                gitConfig = gitConfig.trim();
-                this.logger.info('Read git config file', { gitConfigFile });
-            }
-            catch (error) {
-                const errorMessage = `Could not find git config file: "${gitConfigFile}"`;
-                throw new Error(errorMessage);
-            }
-            const match = this.parser.rawUrl.exec(gitConfig);
-            if (!match || !match.groups) {
-                const errorMessage = `No URL found in git config file: "${gitConfigFile}"`;
-                throw new Error(errorMessage);
-            }
-            const rawUrl = match.groups.rawUrl;
-            this.logger.info('Found raw URL', { rawUrl });
-            return rawUrl;
-        });
+    async parseGitConfig(gitDir) {
+        const gitConfigFile = path.join(gitDir, 'config');
+        let gitConfig;
+        try {
+            gitConfig = await fsAsync.readFile(gitConfigFile, 'utf-8');
+            gitConfig = gitConfig.trim();
+            this.logger.info('Read git config file', { gitConfigFile });
+        }
+        catch (error) {
+            const errorMessage = `Could not find git config file: "${gitConfigFile}"`;
+            throw new Error(errorMessage);
+        }
+        const match = this.parser.rawUrl.exec(gitConfig);
+        if (!match || !match.groups) {
+            const errorMessage = `No URL found in git config file: "${gitConfigFile}"`;
+            throw new Error(errorMessage);
+        }
+        const rawUrl = match.groups.rawUrl;
+        this.logger.info('Found raw URL', { rawUrl });
+        return rawUrl;
     }
 }

package/dist/cjs/cli.js

@@ -1,13 +1,4 @@
 #!/usr/bin/env node
-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());
-    });
-};
 import path from 'path';
 import { program as commander } from 'commander';
 import { findUp } from 'find-up';
@@ -28,16 +19,19 @@ commander
     .parse(process.argv);
 const resolvedBaseDir = path.resolve(commander.args[0] || '.');
 const commanderOptions = commander.opts();
-void (() => __awaiter(void 0, void 0, void 0, function* () {
+void (async () => {
     try {
-        const gitDir = yield findUp('.git', { cwd: resolvedBaseDir, type: 'directory' });
+        const gitDir = await findUp('.git', { cwd: resolvedBaseDir, type: 'directory' });
         if (!gitDir) {
             throw new Error(`Could not find a git repository in "${resolvedBaseDir}".`);
         }
-        const repositoryService = new RepositoryService(Object.assign(Object.assign({}, (commanderOptions.debug && { debug: commanderOptions.debug })), (commanderOptions.timeout && { timeout: parseInt(commanderOptions.timeout, 10) })));
-        let fullUrl = yield repositoryService.getFullUrl(gitDir);
+        const repositoryService = new RepositoryService({
+            ...(commanderOptions.debug && { debug: commanderOptions.debug }),
+            ...(commanderOptions.timeout && { timeout: parseInt(commanderOptions.timeout, 10) }),
+        });
+        let fullUrl = await repositoryService.getFullUrl(gitDir);
         if (!commanderOptions.branch) {
-            const pullRequestUrl = yield repositoryService.getPullRequestUrl(fullUrl);
+            const pullRequestUrl = await repositoryService.getPullRequestUrl(fullUrl);
             if (pullRequestUrl) {
                 fullUrl = pullRequestUrl;
             }
@@ -46,7 +40,7 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
             console.info(fullUrl);
         }
         else {
-            yield open(fullUrl);
+            await open(fullUrl);
         }
         process.exit();
     }
@@ -54,4 +48,4 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
         console.error(error.message);
         process.exit(1);
     }
-}))();
+})();

package/dist/esm/RepositoryService.js

@@ -10,7 +10,7 @@ export class RepositoryService {
             pullRequest: new RegExp('github\\.com\\/(?<user>[^\\/]+)\\/(?<project>[^/]+)\\/tree\\/(?<branch>.*)'),
             rawUrl: new RegExp('.*url = (?<rawUrl>.*)', 'mi'),
         };
-        this.options = Object.assign({ debug: false, timeout: 2000 }, options);
+        this.options = { debug: false, timeout: 2000, ...options };
         this.gitHubClient = new GitHubClient(this.options.timeout);
         this.logger = logdown('gh-open', {
             logger: console,

package/dist/esm/cli.js

@@ -25,7 +25,10 @@ void (async () => {
         if (!gitDir) {
             throw new Error(`Could not find a git repository in "${resolvedBaseDir}".`);
         }
-        const repositoryService = new RepositoryService(Object.assign(Object.assign({}, (commanderOptions.debug && { debug: commanderOptions.debug })), (commanderOptions.timeout && { timeout: parseInt(commanderOptions.timeout, 10) })));
+        const repositoryService = new RepositoryService({
+            ...(commanderOptions.debug && { debug: commanderOptions.debug }),
+            ...(commanderOptions.timeout && { timeout: parseInt(commanderOptions.timeout, 10) }),
+        });
         let fullUrl = await repositoryService.getFullUrl(gitDir);
         if (!commanderOptions.branch) {
             const pullRequestUrl = await repositoryService.getPullRequestUrl(fullUrl);

package/package.json

@@ -13,7 +13,7 @@
     "http-status-codes": "2.3.0",
     "nock": "13.5.4",
     "rimraf": "5.0.7",
-    "typescript": "5.4.5",
+    "typescript": "5.5.2",
     "vitest": "1.6.0"
   },
   "engines": {
@@ -51,6 +51,6 @@
     "test": "vitest run"
   },
   "type": "module",
-  "version": "3.6.4",
-  "gitHead": "28c184f53a87d8eb082cc27c923ef7b352bbe875"
+  "version": "3.6.5",
+  "gitHead": "f7a6a79286e4eb85392b5f2d33942ab166142109"
 }