Update main client file

Author: jverce

src/Client.ts

@@ -1,55 +1,32 @@
-/**
- * This file was auto-generated by Fern from our API Definition.
- */
+// This file was initially auto-generated by Fern from our API Definition.
+// It was later customized by the Pipedream team.
 
-import * as environments from "./environments.js";
-import * as core from "./core/index.js";
-import * as Pipedream from "./api/index.js";
-import { OauthTokens } from "./api/resources/oauthTokens/client/Client.js";
-import { mergeHeaders } from "./core/headers.js";
+import { SDK_VERSION } from "version.js";
+import { Accounts } from "./api/resources/accounts/client/Client.js";
+import { Actions } from "./api/resources/actions/client/Client.js";
 import { AppCategories } from "./api/resources/appCategories/client/Client.js";
 import { Apps } from "./api/resources/apps/client/Client.js";
-import { Accounts } from "./api/resources/accounts/client/Client.js";
-import { Users } from "./api/resources/users/client/Client.js";
 import { Components } from "./api/resources/components/client/Client.js";
-import { Actions } from "./api/resources/actions/client/Client.js";
-import { Triggers } from "./api/resources/triggers/client/Client.js";
 import { DeployedTriggers } from "./api/resources/deployedTriggers/client/Client.js";
 import { FileStash } from "./api/resources/fileStash/client/Client.js";
+import { OauthTokens } from "./api/resources/oauthTokens/client/Client.js";
 import { Projects } from "./api/resources/projects/client/Client.js";
 import { Proxy } from "./api/resources/proxy/client/Client.js";
 import { Tokens } from "./api/resources/tokens/client/Client.js";
-import { SDK_VERSION } from "./version.js";
+import { Triggers } from "./api/resources/triggers/client/Client.js";
+import { Users } from "./api/resources/users/client/Client.js";
+import type { BaseClientOptions, BaseRequestOptions } from "./BaseClient.js";
+import { mergeHeaders } from "./core/headers.js";
+import * as core from "./core/index.js";
 
 export declare namespace PipedreamClient {
-    export interface Options {
-        environment?: core.Supplier<environments.PipedreamEnvironment | string>;
-        /** Specify a custom URL to connect the client to. */
-        baseUrl?: core.Supplier<string>;
+    export interface Options extends BaseClientOptions {
         clientId?: core.Supplier<string>;
         clientSecret?: core.Supplier<string>;
         tokenProvider?: core.TokenProvider;
-        projectId: string;
-        /** Override the x-pd-environment header */
-        projectEnvironment?: core.Supplier<Pipedream.ProjectEnvironment | undefined>;
-        /** Additional headers to include in requests. */
-        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
-    }
-
-    export interface RequestOptions {
-        /** The maximum time to wait for a response in seconds. */
-        timeoutInSeconds?: number;
-        /** The number of times to retry the request. Defaults to 2. */
-        maxRetries?: number;
-        /** A hook to abort the request. */
-        abortSignal?: AbortSignal;
-        /** Override the x-pd-environment header */
-        projectEnvironment?: Pipedream.ProjectEnvironment | undefined;
-        /** Additional query string parameters to include in the request. */
-        queryParams?: Record<string, unknown>;
-        /** Additional headers to include in the request. */
-        headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
     }
+
+    export interface RequestOptions extends BaseRequestOptions {}
 }
 
 export class PipedreamClient {
@@ -90,14 +67,14 @@ export class PipedreamClient {
     }
 
     private newOAuthTokenProvider(): core.OAuthTokenProvider {
-        const clientId = this._options.clientId ?? process.env["PIPEDREAM_CLIENT_ID"];
+        const clientId = this._options.clientId ?? process.env.PIPEDREAM_CLIENT_ID;
         if (clientId == null) {
             throw new Error(
                 "clientId is required; either pass it as an argument or set the PIPEDREAM_CLIENT_ID environment variable",
             );
         }
 
-        const clientSecret = this._options.clientSecret ?? process.env["PIPEDREAM_CLIENT_SECRET"];
+        const clientSecret = this._options.clientSecret ?? process.env.PIPEDREAM_CLIENT_SECRET;
         if (clientSecret == null) {
             throw new Error(
                 "clientSecret is required; either pass it as an argument or set the PIPEDREAM_CLIENT_SECRET environment variable",