Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,4 @@ jobs:
uses: actions/setup-node@v3

- name: Compile
run: yarn && yarn test

publish:
needs:
- compile
- test
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up node
uses: actions/setup-node@v3
- name: Install dependencies
run: yarn install --frozen-lockfile --non-interactive

- name: Build
run: yarn build
- name: Set up NPM authentication
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- name: Publish
run: npm publish --access public --no-git-tag-version --tag latest
run: yarn && yarn test
45 changes: 7 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pipedream/sdk",
"version": "2.0.13",
"version": "2.0.14",
"private": false,
"repository": "github:PipedreamHQ/pipedream-sdk-typescript",
"type": "commonjs",
Expand All @@ -10,11 +10,6 @@
"exports": {
".": {
"types": "./dist/cjs/index.d.ts",
"browser": {
"types": "./dist/esm/browser/index.d.mts",
"import": "./dist/esm/browser/index.mjs",
"default": "./dist/esm/browser/index.mjs"
},
"import": {
"types": "./dist/esm/index.d.mts",
"default": "./dist/esm/index.mjs"
Expand All @@ -25,18 +20,6 @@
},
"default": "./dist/cjs/index.js"
},
"./browser": {
"types": "./dist/esm/browser/index.d.mts",
"import": {
"types": "./dist/esm/browser/index.d.mts",
"default": "./dist/esm/browser/index.mjs"
},
"require": {
"types": "./dist/cjs/browser/index.d.ts",
"default": "./dist/cjs/browser/index.js"
},
"default": "./dist/esm/browser/index.mjs"
},
"./serialization": {
"types": "./dist/cjs/serialization/index.d.ts",
"import": {
Expand All @@ -49,18 +32,6 @@
},
"default": "./dist/cjs/serialization/index.js"
},
"./server": {
"types": "./dist/cjs/index.d.ts",
"import": {
"types": "./dist/esm/index.d.mts",
"default": "./dist/esm/index.mjs"
},
"require": {
"types": "./dist/cjs/index.d.ts",
"default": "./dist/cjs/index.js"
},
"default": "./dist/cjs/index.js"
},
"./package.json": "./package.json"
},
"files": [
Expand All @@ -80,21 +51,19 @@
"test:wire": "jest --selectProjects wire"
},
"devDependencies": {
"webpack": "^5.97.1",
"ts-loader": "^9.5.1",
"jest": "^29.7.0",
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"@types/node": "^18.19.70",
"jest": "^29.7.0",
"ts-jest": "^29.3.4",
"jest-environment-jsdom": "^29.7.0",
"msw": "^2.8.4",
"@types/node": "^18.19.70",
"prettier": "^3.4.2",
"ts-jest": "^29.3.4",
"ts-loader": "^9.5.1",
"typescript": "~5.7.2",
"webpack": "^5.97.1"
"typescript": "~5.7.2"
},
"browser": {
"./dist/cjs/wrapper/utils/getBaseUrl.js": "./dist/cjs/wrapper/utils/getBaseUrl.browser.js",
"./dist/esm/wrapper/utils/getBaseUrl.mjs": "./dist/esm/wrapper/utils/getBaseUrl.browser.mjs",
"fs": false,
"os": false,
"path": false,
Expand Down
52 changes: 23 additions & 29 deletions src/Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ 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 { Projects } from "./api/resources/projects/client/Client.js";
import { FileStash } from "./api/resources/fileStash/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";

export declare namespace PipedreamClient {
export interface Options {
Expand All @@ -28,7 +27,6 @@ export declare namespace PipedreamClient {
baseUrl?: core.Supplier<string>;
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>;
Expand All @@ -54,7 +52,7 @@ export declare namespace PipedreamClient {

export class PipedreamClient {
protected readonly _options: PipedreamClient.Options;
protected readonly _tokenProvider: core.TokenProvider;
private readonly _oauthTokenProvider: core.OAuthTokenProvider;
protected _appCategories: AppCategories | undefined;
protected _apps: Apps | undefined;
protected _accounts: Accounts | undefined;
Expand All @@ -63,8 +61,8 @@ export class PipedreamClient {
protected _actions: Actions | undefined;
protected _triggers: Triggers | undefined;
protected _deployedTriggers: DeployedTriggers | undefined;
protected _fileStash: FileStash | undefined;
protected _projects: Projects | undefined;
protected _fileStash: FileStash | undefined;
protected _proxy: Proxy | undefined;
protected _tokens: Tokens | undefined;
protected _oauthTokens: OauthTokens | undefined;
Expand All @@ -77,19 +75,15 @@ export class PipedreamClient {
"x-pd-environment": _options?.projectEnvironment,
"X-Fern-Language": "JavaScript",
"X-Fern-SDK-Name": "@pipedream/sdk",
"X-Fern-SDK-Version": SDK_VERSION,
"User-Agent": `@pipedream/sdk/${SDK_VERSION}`,
"X-Fern-SDK-Version": "2.0.14",
"User-Agent": "@pipedream/sdk/2.0.14",
"X-Fern-Runtime": core.RUNTIME.type,
"X-Fern-Runtime-Version": core.RUNTIME.version,
},
_options?.headers,
),
};

this._tokenProvider = this._options.tokenProvider ?? this.newOAuthTokenProvider();
}

private newOAuthTokenProvider(): core.OAuthTokenProvider {
const clientId = this._options.clientId ?? process.env["PIPEDREAM_CLIENT_ID"];
if (clientId == null) {
throw new Error(
Expand All @@ -104,7 +98,7 @@ export class PipedreamClient {
);
}

return new core.OAuthTokenProvider({
this._oauthTokenProvider = new core.OAuthTokenProvider({
clientId,
clientSecret,
authClient: new OauthTokens({
Expand All @@ -117,91 +111,91 @@ export class PipedreamClient {
public get appCategories(): AppCategories {
return (this._appCategories ??= new AppCategories({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get apps(): Apps {
return (this._apps ??= new Apps({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get accounts(): Accounts {
return (this._accounts ??= new Accounts({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get users(): Users {
return (this._users ??= new Users({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get components(): Components {
return (this._components ??= new Components({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get actions(): Actions {
return (this._actions ??= new Actions({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get triggers(): Triggers {
return (this._triggers ??= new Triggers({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get deployedTriggers(): DeployedTriggers {
return (this._deployedTriggers ??= new DeployedTriggers({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get fileStash(): FileStash {
return (this._fileStash ??= new FileStash({
public get projects(): Projects {
return (this._projects ??= new Projects({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get projects(): Projects {
return (this._projects ??= new Projects({
public get fileStash(): FileStash {
return (this._fileStash ??= new FileStash({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get proxy(): Proxy {
return (this._proxy ??= new Proxy({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get tokens(): Tokens {
return (this._tokens ??= new Tokens({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}

public get oauthTokens(): OauthTokens {
return (this._oauthTokens ??= new OauthTokens({
...this._options,
token: async () => await this._tokenProvider.getToken(),
token: async () => await this._oauthTokenProvider.getToken(),
}));
}
}
4 changes: 1 addition & 3 deletions src/api/resources/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ export * as components from "./components/index.js";
export * as actions from "./actions/index.js";
export * as triggers from "./triggers/index.js";
export * as deployedTriggers from "./deployedTriggers/index.js";
export * as fileStash from "./fileStash/index.js";
export * as projects from "./projects/index.js";
export * as fileStash from "./fileStash/index.js";
export * as proxy from "./proxy/index.js";
export * as tokens from "./tokens/index.js";
export * as oauthTokens from "./oauthTokens/index.js";
export * as workflows from "./workflows/index.js";
export * from "./apps/client/requests/index.js";
export * from "./accounts/client/requests/index.js";
export * from "./components/client/requests/index.js";
Expand All @@ -23,4 +22,3 @@ export * from "./fileStash/client/requests/index.js";
export * from "./proxy/client/requests/index.js";
export * from "./tokens/client/requests/index.js";
export * from "./oauthTokens/client/requests/index.js";
export * from "./workflows/client/requests/index.js";
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@
export interface CreateOAuthTokenOpts {
clientId: string;
clientSecret: string;
/** Optional space-separated scopes for the access token. Defaults to '*'. */
scope?: string;
}
Loading
Loading