streamline

probot · Oct 3, 2023 · 2cdd817 · 2cdd817
1 parent 7ceaf08
commit 2cdd817
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/manifest-creation.ts b/src/manifest-creation.ts
@@ -3,10 +3,7 @@ import yaml from "js-yaml";
 import path from "path";
 import updateDotenv from "update-dotenv";
 import { ProbotOctokit } from "./octokit/probot-octokit";
-
-type OctokitOptions = NonNullable<
-  ConstructorParameters<typeof ProbotOctokit>[0]
->;
+import type { OctokitOptions } from "./types";
 
 export class ManifestCreation {
   get pkg() {

diff --git a/src/octokit/get-authenticated-octokit.ts b/src/octokit/get-authenticated-octokit.ts
@@ -1,9 +1,10 @@
 import { State } from "../types";
 import { ProbotOctokit } from "./probot-octokit";
+import type { OctokitOptions } from "../types";
 
 type FactoryOptions = {
   octokit: InstanceType<typeof ProbotOctokit>;
-  octokitOptions: ConstructorParameters<typeof ProbotOctokit> & {
+  octokitOptions: OctokitOptions & {
     throttle?: Record<string, unknown>;
     auth?: Record<string, unknown>;
   };

diff --git a/src/types.ts b/src/types.ts
@@ -78,3 +78,7 @@ export type MiddlewareOptions = {
   webhooksPath?: string;
   [key: string]: unknown;
 };
+
+export type OctokitOptions = NonNullable<
+  ConstructorParameters<typeof ProbotOctokit>[0]
+>;
diff --git a/test/probot-octokit.test.ts b/test/probot-octokit.test.ts
@@ -1,12 +1,11 @@
 import fetchMock from "fetch-mock";
 import { ProbotOctokit } from "../src/octokit/probot-octokit";
 import { Headers } from "undici";
-import { RequestError } from "@octokit/types";
-
-type Options = ConstructorParameters<typeof ProbotOctokit>[0];
+import type { RequestError } from "@octokit/types";
+import type { OctokitOptions } from "../src/types";
 
 describe("ProbotOctokit", () => {
-  const defaultOptions: Options = {
+  const defaultOptions: OctokitOptions = {
     retry: {
       // disable retries to test error states
       enabled: false,