From 11aa7dc2647f6b16788f0fdf275603ad064bf6ce Mon Sep 17 00:00:00 2001
From: Charles Kenney <charlesc.kenney@gmail.com>
Date: Thu, 8 Aug 2019 17:04:03 -0400
Subject: [PATCH 1/2] fix typings and allow default export

---
 index.d.ts    | 17 +++++++++++++----
 src/client.js |  6 +++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 89143f5..0ed4ee7 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,6 +1,14 @@
 import { AxiosInstance } from 'axios';
 
+export interface AppOptions {
+  readonly slug: string;
+}
+
 export interface Client {
+  app(options: AppOptions): App;
+}
+
+export interface App {
   readonly app: { slug: string };
 
   /**
@@ -31,7 +39,7 @@ export interface AbortResponse {
 export interface BuildDescription {
   readonly abort_reason: string;
   readonly branch: string;
-  readonly build_number: integer;
+  readonly build_number: number;
   readonly commit_hash: string;
   readonly commit_message: string;
   readonly commit_view_url: string;
@@ -39,14 +47,14 @@ export interface BuildDescription {
   readonly finished_at: string;
   readonly is_on_hold: boolean;
   readonly original_build_params: string;
-  readonly pull_request_id: integer;
+  readonly pull_request_id: number;
   readonly pull_request_target_branch: string;
   readonly pull_request_view_url: string;
   readonly slug: string;
   readonly stack_config_type: string;
   readonly stack_identifier: string;
   readonly started_on_worker_at: string;
-  readonly status: integer;
+  readonly status: number;
   readonly status_text: string;
   readonly tag: string;
   readonly triggered_at: string;
@@ -104,4 +112,5 @@ export interface ClientConfiguration {
   readonly token: string;
 }
 
-export default function createClient(config: ClientConfiguration): Client;
+export const createClient: (config: ClientConfiguration) => Client;
+export default createClient;
diff --git a/src/client.js b/src/client.js
index e31c860..67db881 100644
--- a/src/client.js
+++ b/src/client.js
@@ -3,7 +3,7 @@ const assert = require('assert');
 const axios = require('axios');
 const axiosRetry = require('axios-retry');
 
-module.exports = ({ token }) => {
+const createClient = ({ token }) => {
   assert(token, 'An access token is required');
 
   const client = axios.create({
@@ -17,3 +17,7 @@ module.exports = ({ token }) => {
   instance.app = ({ slug }) => app({ client, slug });
   return instance;
 };
+
+module.exports = createClient;
+module.exports.createClient = createClient;
+module.exports.default = createClient;

From 07013aebda491851b95bd7cf2e646869c080b7e1 Mon Sep 17 00:00:00 2001
From: Charles Kenney <charlesc.kenney@gmail.com>
Date: Fri, 9 Aug 2019 11:53:26 -0400
Subject: [PATCH 2/2] fix module exports

---
 index.d.ts    | 35 +++++++++++++++++------------------
 src/client.js |  2 --
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 0ed4ee7..432be34 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1,14 +1,14 @@
 import { AxiosInstance } from 'axios';
 
-export interface AppOptions {
+declare interface AppOptions {
   readonly slug: string;
 }
 
-export interface Client {
+declare interface Client {
   app(options: AppOptions): App;
 }
 
-export interface App {
+declare interface App {
   readonly app: { slug: string };
 
   /**
@@ -20,23 +20,23 @@ export interface App {
   triggerBuild(buildParams?: BuildOptions): Promise<Build>;
 }
 
-export interface AbortOptions {
+declare interface AbortOptions {
   readonly reason?: string;
   readonly withSuccess?: boolean;
   readonly skipNotifications?: boolean;
 }
 
-export interface FollowOptions {
+declare interface FollowOptions {
   readonly heartbeat?: number;
   readonly interval?: number;
 }
 
-export interface AbortResponse {
+declare interface AbortResponse {
   readonly status?: string;
   readonly message?: string;
 }
 
-export interface BuildDescription {
+declare interface BuildDescription {
   readonly abort_reason: string;
   readonly branch: string;
   readonly build_number: number;
@@ -62,10 +62,8 @@ export interface BuildDescription {
   readonly triggered_workflow: string;
 }
 
-export interface Build {
-  abort(
-    options?: Pick<AbortOptions, Exclude<AbortOptions, 'reason'>>
-  ): Promise<void>;
+declare interface Build {
+  abort(options?: Omit<AbortOptions, 'reason'>): Promise<void>;
   abort(options?: AbortOptions): Promise<AbortResponse>;
 
   describe(): Promise<BuildDescription>;
@@ -75,19 +73,19 @@ export interface Build {
   isFinished(): Promise<Boolean>;
 }
 
-export interface CommitPathsFilter {
+declare interface CommitPathsFilter {
   readonly added?: string[];
   readonly modified?: string[];
   readonly removed?: string[];
 }
 
-export type BuildTargetStrategy =
+declare type BuildTargetStrategy =
   | { branch: string }
   | { commitHash: string }
   | { workflow: string }
   | { tag: string };
 
-export interface BaseBuildOptions {
+declare interface BaseBuildOptions {
   readonly branch?: string;
   readonly commitHash?: string;
   readonly commitMessage?: string;
@@ -106,11 +104,12 @@ export interface BaseBuildOptions {
   readonly target?: string;
 }
 
-export type BuildOptions = BaseBuildOptions & BuildTargetStrategy;
+declare type BuildOptions = BaseBuildOptions & BuildTargetStrategy;
 
-export interface ClientConfiguration {
+declare interface ClientConfiguration {
   readonly token: string;
 }
 
-export const createClient: (config: ClientConfiguration) => Client;
-export default createClient;
+declare function createClient(config: ClientConfiguration): Client;
+
+export = createClient;
diff --git a/src/client.js b/src/client.js
index 67db881..2a11815 100644
--- a/src/client.js
+++ b/src/client.js
@@ -19,5 +19,3 @@ const createClient = ({ token }) => {
 };
 
 module.exports = createClient;
-module.exports.createClient = createClient;
-module.exports.default = createClient;