Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
Fix: Issues with reponse parsing related to zod schema (#1748)
Musthaq Ahamad9a10986d86c5
diff --git a/.changeset/loud-peaches-brush.md b/.changeset/loud-peaches-brush.mdnew file mode 100644index 000000000..5ccc7b650--- /dev/null+++ b/.changeset/loud-peaches-brush.md@@ -0,0 +1,13 @@+---+'@composio/core': patch+'@composio/anthropic': patch+'@composio/cloudflare': patch+'@composio/google': patch+'@composio/langchain': patch+'@composio/mastra': patch+'@composio/openai': patch+'@composio/openai-agents': patch+'@composio/vercel': patch+---++Fix: Relax strict type/schema validations on API responsesdiff --git a/.changeset/pre.json b/.changeset/pre.jsonindex 9c924d663..fa5327a98 100644--- a/.changeset/pre.json+++ b/.changeset/pre.json@@ -18,6 +18,7 @@"cold-badgers-drop","cuddly-dragons-knock","eighty-actors-smile",+ "loud-peaches-brush","modern-parents-bake","modern-webs-admire","polite-suits-accept",diff --git a/.github/workflows/build.yml b/.github/workflows/ts.build.ymlsimilarity index 100%rename from .github/workflows/build.ymlrename to .github/workflows/ts.build.ymldiff --git a/.github/workflows/release.yml b/.github/workflows/ts.release.ymlsimilarity index 100%rename from .github/workflows/release.ymlrename to .github/workflows/ts.release.ymldiff --git a/.github/workflows/test.yml b/.github/workflows/ts.test.ymlsimilarity index 100%rename from .github/workflows/test.ymlrename to .github/workflows/ts.test.ymldiff --git a/.github/workflows/ts.typecheck.yml b/.github/workflows/ts.typecheck.ymlnew file mode 100644index 000000000..7d6edc71a--- /dev/null+++ b/.github/workflows/ts.typecheck.yml@@ -0,0 +1,33 @@+name: Typecheck Typescript SDK++on:+ push:+ branches: [main, next]+ pull_request:+ branches: [main, next]++jobs:+ typecheck:+ name: Typecheck Typescript SDK+ runs-on: ubuntu-latest++ steps:+ - name: Checkout Code+ uses: actions/checkout@v3++ - name: Setup PNPM+ uses: pnpm/action-setup@v2+ with:+ version: 10.8.0 # Match the version in package.json++ - name: Set up Node.js+ uses: actions/setup-node@v3+ with:+ node-version: "20"+ cache: "pnpm"++ - name: Install Dependencies+ run: pnpm install --frozen-lockfile++ - name: Run Typecheck+ run: pnpm run typecheckdiff --git a/package.json b/package.jsonindex b30134bd1..e224512ff 100644--- a/package.json+++ b/package.json@@ -14,6 +14,7 @@"build:packages": "turbo build --filter=./ts/packages/**","test": "turbo test --filter=./ts/packages/**","test:ui": "vitest --ui",+ "typecheck": "turbo typecheck --filter=./ts/packages/**","lint": "eslint ts/packages --ext .ts,.tsx","lint:packages": "eslint ts/packages --ext .ts,.tsx","lint:fix": "eslint . --ext .ts,.tsx --fix",diff --git a/ts/examples/toolkits/src/example.json b/ts/examples/toolkits/src/example.jsonnew file mode 100644index 000000000..e69de29bbdiff --git a/ts/examples/toolkits/src/toolkits.ts b/ts/examples/toolkits/src/toolkits.tsnew file mode 100644index 000000000..90b731a6b--- /dev/null+++ b/ts/examples/toolkits/src/toolkits.ts@@ -0,0 +1,7 @@+import { Composio } from '@composio/core';++const composio = new Composio();++const toolkits = await composio.toolkits.get({});++console.log(JSON.stringify(toolkits, null, 2));diff --git a/ts/packages/core/CHANGELOG.md b/ts/packages/core/CHANGELOG.mdindex 5f832d740..0c304166b 100644--- a/ts/packages/core/CHANGELOG.md+++ b/ts/packages/core/CHANGELOG.md@@ -1,5 +1,11 @@# @composio/core+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/core/package.json b/ts/packages/core/package.jsonindex 3cc799db0..330c84590 100644--- a/ts/packages/core/package.json+++ b/ts/packages/core/package.json@@ -1,6 +1,6 @@{"name": "@composio/core",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "src/index.ts","type": "module",@@ -28,7 +28,8 @@"scripts": {"clean": "git clean -xdf node_modules","build": "tsup",- "test": "vitest run"+ "test": "vitest run",+ "typecheck": "tsc --noEmit --skipLibCheck"},"keywords": [],"author": "",diff --git a/ts/packages/core/src/models/AuthConfigs.ts b/ts/packages/core/src/models/AuthConfigs.tsindex 309239065..62ac8cc2e 100644--- a/ts/packages/core/src/models/AuthConfigs.ts+++ b/ts/packages/core/src/models/AuthConfigs.ts@@ -29,6 +29,11 @@ import {import { ValidationError } from '../errors/ValidationErrors';import { telemetry } from '../telemetry/Telemetry';import logger from '../utils/logger';+import {+ transformAuthConfigListResponse,+ transformAuthConfigRetrieveResponse,+ transformCreateAuthConfigResponse,+} from '../utils/transformers/authConfigs';/*** AuthConfigs class*@@ -52,50 +57,6 @@ export class AuthConfigs {return this.client;}- /**- * Transforms an auth config response from API format to SDK format.- *- * This method converts property names from snake_case to camelCase and reorganizes- * the data structure to match the SDK's standardized format for auth configurations.- *- * @param {ComposioAuthConfigRetrieveResponse} authConfig - The raw API response to transform- * @returns {AuthConfigRetrieveResponse} The transformed auth config data- * @throws {ValidationError} If the response fails validation against the expected schema- *- * @private- */- private parseAuthConfigRetrieveResponse(- authConfig: ComposioAuthConfigRetrieveResponse- ): AuthConfigRetrieveResponse {- const responseToParse = {- id: authConfig.id,- name: authConfig.name,- noOfConnections: authConfig.no_of_connections,- status: authConfig.status,- toolkit: {- logo: authConfig.toolkit.logo,- slug: authConfig.toolkit.slug,- },- uuid: authConfig.uuid,- authScheme: authConfig.auth_scheme,- credentials: authConfig.credentials,- expectedInputFields: authConfig.expected_input_fields,- isComposioManaged: authConfig.is_composio_managed,- createdBy: authConfig.created_by,- createdAt: authConfig.created_at,- lastUpdatedAt: authConfig.last_updated_at,- restrictToFollowingTools: authConfig.restrict_to_following_tools,- };- const result = AuthConfigRetrieveResponseSchema.safeParse(responseToParse);- if (result.error) {- logger.error('Failed to parse auth config response', {- cause: result.error,- });- return responseToParse as AuthConfigRetrieveResponse;- }- return result.data;- }-/*** Lists authentication configurations based on provided filter criteria.*@@ -130,17 +91,7 @@ export class AuthConfigs {limit: parsedQuery?.limit,toolkit_slug: parsedQuery?.toolkit,});- const parsedResult = AuthConfigListResponseSchema.safeParse({- items: result.items.map(item => this.parseAuthConfigRetrieveResponse(item)),- nextCursor: result.next_cursor,- totalPages: result.total_pages,- });- if (parsedResult.error) {- throw new ValidationError('Failed to parse auth config list response', {- cause: parsedResult.error,- });- }- return parsedResult.data;+ return transformAuthConfigListResponse(result);}/**@@ -191,18 +142,7 @@ export class AuthConfigs {restrict_to_following_tools: parsedOptions.data.restrictToFollowingTools,},});- const parsedResult = CreateAuthConfigResponseSchema.safeParse({- id: result.auth_config.id,- authScheme: result.auth_config.auth_scheme,- isComposioManaged: result.auth_config.is_composio_managed,- toolkit: result.toolkit.slug,- });- if (parsedResult.error) {- throw new ValidationError('Failed to parse auth config create response', {- cause: parsedResult.error,- });- }- return parsedResult.data;+ return transformCreateAuthConfigResponse(result);}/**@@ -226,7 +166,7 @@ export class AuthConfigs {*/async get(nanoid: string): Promise<AuthConfigRetrieveResponse> {const result = await this.client.authConfigs.retrieve(nanoid);- return this.parseAuthConfigRetrieveResponse(result);+ return transformAuthConfigRetrieveResponse(result);}/**diff --git a/ts/packages/core/src/models/ConnectedAccounts.ts b/ts/packages/core/src/models/ConnectedAccounts.tsindex fabd91af6..c53a82c40 100644--- a/ts/packages/core/src/models/ConnectedAccounts.ts+++ b/ts/packages/core/src/models/ConnectedAccounts.ts@@ -26,16 +26,13 @@ import { ConnectionRequest } from '../types/connectionRequest.types';import { createConnectionRequest } from './ConnectionRequest';import { ValidationError } from '../errors/ValidationErrors';import { telemetry } from '../telemetry/Telemetry';-import { transformConnectedAccountResponse } from '../utils/transformers/connectedAccounts';+import {+ transformConnectedAccountListResponse,+ transformConnectedAccountResponse,+} from '../utils/transformers/connectedAccounts';import { ComposioMultipleConnectedAccountsError } from '../errors';import logger from '../utils/logger';-import { AuthSchemeType } from '../types/authConfigs.types';-import { AuthScheme } from './AuthScheme';-import {- ConnectionData,- ConnectionDataSchema,- ConnectionStatuses,-} from '../types/connectedAccountAuthStates.types';+import { ConnectionData } from '../types/connectedAccountAuthStates.types';/*** ConnectedAccounts class*@@ -97,18 +94,7 @@ export class ConnectedAccounts {}const result = await this.client.connectedAccounts.list(rawQuery);-- const parsedResponse = ConnectedAccountListResponseSchema.safeParse({- items: result.items.map(transformConnectedAccountResponse),- nextCursor: result.next_cursor,- totalPages: result.total_pages,- });- if (!parsedResponse.success) {- throw new ValidationError('Failed to parse connected account list response', {- cause: parsedResponse.error,- });- }- return parsedResponse.data;+ return transformConnectedAccountListResponse(result);}/**diff --git a/ts/packages/core/src/models/Toolkits.ts b/ts/packages/core/src/models/Toolkits.tsindex 31d5574f5..cabb3a346 100644--- a/ts/packages/core/src/models/Toolkits.ts+++ b/ts/packages/core/src/models/Toolkits.ts@@ -1,15 +1,10 @@import ComposioClient from '@composio/client';import {- ToolKitItemSchema,ToolkitListParams,ToolKitListResponse,- ToolKitListResponseSchema,ToolkitRetrieveResponse,- ToolkitRetrieveResponseSchema,ToolkitsListParamsSchema,ToolkitRetrieveCategoriesResponse,- ToolkitRetrieveCategoriesResponseSchema,- ToolkitCategorySchema,ToolkitAuthFieldsResponse,} from '../types/toolkit.types';import { ComposioToolkitFetchError, ComposioToolkitNotFoundError } from '../errors';@@ -22,6 +17,11 @@ import { telemetry } from '../telemetry/Telemetry';import { AuthSchemeType } from '../types/authConfigs.types';import logger from '../utils/logger';import { APIError } from 'openai';+import {+ transformToolkitListResponse,+ transformToolkitRetrieveCategoriesResponse,+ transformToolkitRetrieveResponse,+} from '../utils/transformers/toolkits';/*** Toolkits class*@@ -62,42 +62,7 @@ export class Toolkits {sort_by: parsedQuery.data.sortBy,});- const parsedResult = ToolKitListResponseSchema.safeParse(- result.items.map(item => {- const parsedItem = ToolKitItemSchema.safeParse({- name: item.name,- slug: item.slug,- meta: {- ...item.meta,- createdAt: item.meta.created_at,- updatedAt: item.meta.updated_at,- toolsCount: item.meta.tools_count,- triggersCount: item.meta.triggers_count,- categories: item.meta.categories,- appUrl: item.meta.app_url,- logo: item.meta.logo,- },- isLocalToolkit: item.is_local_toolkit,- authSchemes: item.auth_schemes,- composioManagedAuthSchemes: item.composio_managed_auth_schemes,- noAuth: item.no_auth,- });- if (!parsedItem.success) {- throw new ValidationError('Failed to parse toolkit response', {- cause: parsedItem.error,- });- }- return parsedItem.data;- })- );-- if (!parsedResult.success) {- throw new ValidationError('Failed to parse toolkit list response', {- cause: parsedResult.error,- });- }-- return parsedResult.data;+ return transformToolkitListResponse(result);} catch (error) {throw new ComposioToolkitFetchError('Failed to fetch toolkits', {cause: error,@@ -120,37 +85,7 @@ export class Toolkits {protected async getToolkitBySlug(slug: string): Promise<ToolkitRetrieveResponse> {try {const result = await this.client.toolkits.retrieve(slug);- const parsedResult = ToolkitRetrieveResponseSchema.safeParse({- name: result.name,- slug: result.slug,- meta: {- ...result.meta,- createdAt: result.meta.created_at,- updatedAt: result.meta.updated_at,- toolsCount: result.meta.tools_count,- triggersCount: result.meta.triggers_count,- // appUrl: result.meta.app_url, @TODO Update the client type to include this- },- isLocalToolkit: result.is_local_toolkit,- composioManagedAuthSchemes: result.composio_managed_auth_schemes,- authConfigDetails: result.auth_config_details?.map(authConfig => ({- name: authConfig.name,- mode: authConfig.mode,- fields: {- authConfigCreation: authConfig.fields.auth_config_creation,- connectedAccountInitiation: authConfig.fields.connected_account_initiation,- },- proxy: {- baseUrl: authConfig.proxy?.base_url,- },- })),- });- if (!parsedResult.success) {- throw new ValidationError('Failed to parse toolkit response', {- cause: parsedResult.error,- });- }- return parsedResult.data;+ return transformToolkitRetrieveResponse(result);} catch (error) {if (error instanceof APIError && (error.status === 404 || error.status === 400)) {throw new ComposioToolkitNotFoundError(`Toolkit with slug ${slug} not found`, {@@ -208,7 +143,7 @@ export class Toolkits {* });* ```*/- async get(query: ToolkitListParams): Promise<ToolKitListResponse>;+ async get(query?: ToolkitListParams): Promise<ToolKitListResponse>;/*** Implementation method that handles both overloads for retrieving toolkits.@@ -217,12 +152,12 @@ export class Toolkits {* @returns {Promise<ToolkitRetrieveResponse | ToolKitListResponse>} The toolkit or list of toolkits*/async get(- arg: string | ToolkitListParams+ arg?: string | ToolkitListParams): Promise<ToolkitRetrieveResponse | ToolKitListResponse> {if (typeof arg === 'string') {return this.getToolkitBySlug(arg);}- return this.getToolkits(arg);+ return this.getToolkits(arg ?? {});}private async getAuthConfigFields(@@ -343,23 +278,7 @@ export class Toolkits {*/async listCategories(): Promise<ToolkitRetrieveCategoriesResponse> {const result = await this.client.toolkits.retrieveCategories();- const parsedResult = ToolkitRetrieveCategoriesResponseSchema.safeParse({- items: result.items.map(item => {- const parsedItem = ToolkitCategorySchema.parse({- id: item.id,- name: item.name,- });- return parsedItem;- }),- nextCursor: result.next_cursor,- totalPages: result.total_pages,- });- if (!parsedResult.success) {- throw new ValidationError('Failed to parse toolkit categories response', {- cause: parsedResult.error,- });- }- return parsedResult.data;+ return transformToolkitRetrieveCategoriesResponse(result);}/**diff --git a/ts/packages/core/src/models/Triggers.ts b/ts/packages/core/src/models/Triggers.tsindex bc2fcf921..c5184682c 100644--- a/ts/packages/core/src/models/Triggers.ts+++ b/ts/packages/core/src/models/Triggers.ts@@ -1,36 +1,23 @@import ComposioClient, { APIError } from '@composio/client';+import { TriggersTypeRetrieveEnumResponse } from '@composio/client/resources/index';import {- TriggerInstanceListActiveResponse as TriggerInstanceListActiveResponseComposio,- TriggersTypeListParams as TriggersTypeListParamsRaw,- TriggersTypeListResponse as TriggersTypeListResponseRaw,- TriggersTypeRetrieveEnumResponse,- TriggersTypeRetrieveResponse as TriggersTypeRetrieveResponseRaw,-} from '@composio/client/resources/index';-import {- TriggerInstanceUpsertResponseSchema,TriggerInstanceUpsertResponse,TriggerInstanceUpsertParamsSchema,TriggerInstanceUpsertParams,TriggerInstanceListActiveParams,TriggerInstanceListActiveParamsSchema,TriggerInstanceListActiveResponse,- TriggerInstanceListActiveResponseItemSchema,- TriggerInstanceListActiveResponseSchema,TriggerSubscribeParams,TriggerInstanceManageUpdateParams,TriggerInstanceManageUpdateResponse,TriggerInstanceManageDeleteResponse,- TriggerInstanceManageDeleteResponseSchema,TriggerSubscribeParamSchema,- IncomingTriggerPayloadSchema,IncomingTriggerPayload,TriggerData,TriggersTypeListParams,TriggersTypeListResponse,- TriggersTypeListResponseSchema,TriggersTypeListParamsSchema,TriggersTypeRetrieveResponse,- TriggerTypeSchema,} from '../types/triggers.types';import logger from '../utils/logger';import { telemetry } from '../telemetry/Telemetry';@@ -38,6 +25,12 @@ import { ComposioConnectedAccountNotFoundError, ValidationError } from '../errorimport { PusherService } from '../services/pusher/Pusher';import { ComposioTriggerTypeNotFoundError } from '../errors/TriggerErrors';import { transform } from '../utils/transform';+import {+ transformIncomingTriggerPayload,+ transformTriggerInstanceListActiveResponse,+ transformTriggerTypeListResponse,+ transformTriggerTypeRetrieveResponse,+} from '../utils/transformers/triggers';/*** Trigger (Instance) class* /api/v3/trigger_instances@@ -53,34 +46,6 @@ export class Triggers {telemetry.instrument(this);}- /**- * Parse the trigger instance list active item- *- * @param response - The response from the composio client- * @returns The parsed trigger instance list active item- */- private parseTriggerInstanceListActiveItem(- response: TriggerInstanceListActiveResponseComposio['items'][0]- ) {- const parsed = TriggerInstanceListActiveResponseItemSchema.safeParse({- id: response.id,- connectedAccountId: response.connected_account_id,- disabledAt: response.disabled_at,- state: response.state,- triggerConfig: response.trigger_config,- triggerName: response.trigger_name,- updatedAt: response.updated_at,- triggerData: response.trigger_data,- uuid: response.uuid,- });- if (!parsed.success) {- throw new ValidationError(`Invalid trigger instance list active item`, {- cause: parsed.error,- });- }- return parsed.data;- }-/*** Fetch list of all the active triggers*@@ -124,20 +89,7 @@ export class Triggers {}: undefined);-- const parsedResult = TriggerInstanceListActiveResponseSchema.safeParse({- items: result.items.map(item => this.parseTriggerInstanceListActiveItem(item)),- nextCursor: result.next_cursor,- totalPages: result.total_pages,- } as TriggerInstanceListActiveResponse);-- if (!parsedResult.success) {- throw new ValidationError(`Invalid trigger instance list active response`, {- cause: parsedResult.error,- });- }-- return parsedResult.data;+ return transformTriggerInstanceListActiveResponse(result);}/**@@ -244,17 +196,9 @@ export class Triggers {trigger_config: parsedBody.data.triggerConfig,});- const parsedResult = TriggerInstanceUpsertResponseSchema.safeParse({+ return {triggerId: result.trigger_id,- } as TriggerInstanceUpsertResponse);-- if (!parsedResult.success) {- throw new ValidationError(`Invalid trigger instance upsert response`, {- cause: parsedResult.error,- });- }-- return parsedResult.data;+ };}/**@@ -279,17 +223,9 @@ export class Triggers {*/async delete(triggerId: string): Promise<TriggerInstanceManageDeleteResponse> {const result = await this.client.triggerInstances.manage.delete(triggerId);- const parsedResult = TriggerInstanceManageDeleteResponseSchema.safeParse({+ return {triggerId: result.trigger_id,- });-- if (!parsedResult.success) {- throw new ValidationError(`Invalid trigger instance manage delete response`, {- cause: parsedResult.error,- });- }-- return parsedResult.data;+ };}/**@@ -337,15 +273,7 @@ export class Triggers {toolkit_slugs: parsedQuery.toolkits,});- const parsedResult = transform(result)- .with(TriggersTypeListResponseSchema)- .using(raw => ({- items: raw.items,- nextCursor: raw.next_cursor ?? null,- totalPages: raw.total_pages,- }));-- return parsedResult;+ return transformTriggerTypeListResponse(result);}/**@@ -357,23 +285,7 @@ export class Triggers {*/async getType(slug: string): Promise<TriggersTypeRetrieveResponse> {const result = await this.client.triggersTypes.retrieve(slug);- const parsedResult = transform(result)- .with(TriggerTypeSchema)- .using(raw => ({- slug: raw.slug,- name: raw.name,- description: raw.description,- instructions: raw.instructions,- toolkit: {- logo: raw.toolkit.logo,- slug: raw.toolkit.slug,- name: raw.toolkit.name,- },- payload: raw.payload,- config: raw.config,- }));-- return parsedResult;+ return transformTriggerTypeRetrieveResponse(result);}/**@@ -499,42 +411,11 @@ export class Triggers {// @TODO: This is a temporary fix to get the trigger data// ideally we should have a type for the trigger dataconst data = _data as TriggerData;- const parsedData = IncomingTriggerPayloadSchema.safeParse({- id: data.metadata.nanoId,- uuid: data.metadata.id,- triggerSlug: data.metadata.triggerName,- toolkitSlug: data.appName,- userId: data.metadata.connection?.clientUniqueUserId,- payload: data.payload,- originalPayload: data.originalPayload,- metadata: {- id: data.metadata.nanoId,- uuid: data.metadata.id,- triggerConfig: data.metadata.triggerConfig,- triggerSlug: data.metadata.triggerName,- toolkitSlug: data.appName,- triggerData: data.metadata.triggerData,- connectedAccount: {- id: data.metadata.connection?.connectedAccountNanoId,- uuid: data.metadata.connection?.id,- authConfigId: data.metadata.connection?.authConfigNanoId,- authConfigUUID: data.metadata.connection?.integrationId,- userId: data.metadata.connection?.clientUniqueUserId,- status: data.metadata.connection?.status,- },- },- });+ const parsedData = transformIncomingTriggerPayload(data);- logger.debug('Parsed trigger data', JSON.stringify(parsedData.data, null, 2));-- if (parsedData.error) {- throw new ValidationError(`Invalid trigger payload`, {- cause: parsedData.error,- });- }- if (this.shouldSendTriggerAfterFilters(parsedFilters.data, parsedData.data)) {+ if (this.shouldSendTriggerAfterFilters(parsedFilters.data, parsedData)) {try {- fn(parsedData.data);+ fn(parsedData);} catch (error) {logger.error('❌ Error in trigger callback:', error);}diff --git a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts b/ts/packages/core/src/types/connectedAccountAuthStates.types.tsindex a81e1f957..0b1a6943a 100644--- a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts+++ b/ts/packages/core/src/types/connectedAccountAuthStates.types.ts@@ -7,6 +7,7 @@ export const ConnectionStatuses = {ACTIVE: 'ACTIVE',FAILED: 'FAILED',EXPIRED: 'EXPIRED',+ INACTIVE: 'INACTIVE',} as const;export type ConnectionStatusEnum = (typeof ConnectionStatuses)[keyof typeof ConnectionStatuses];@@ -87,12 +88,12 @@ export const Oauth2InitiatedConnectionDataSchema = Oauth2InitiatingConnectionDatexport const Oauth2ActiveConnectionDataSchema = Oauth2InitiatingConnectionDataSchema.extend({status: z.literal(ConnectionStatuses.ACTIVE),- access_token: z.string(),+ access_token: z.string().optional(),id_token: z.string().optional(),- token_type: z.string(),+ token_type: z.string().optional(),refresh_token: z.string().optional(),- expires_in: z.number().optional(),- scope: z.string().optional(),+ expires_in: z.union([z.string(), z.number(), z.null()]).optional(),+ scope: z.union([z.string(), z.array(z.string())]).optional(),// previously verification_token, will be sent as verification_token to slackwebhook_signature: z.string().optional(),authed_user: z@@ -115,12 +116,17 @@ export const Oauth2ExpiredConnectionDataSchema = Oauth2InitiatingConnectionDataSexpired_at: z.string().optional(),}).catchall(z.unknown());+export const Oauth2InactiveConnectionDataSchema = Oauth2InitiatingConnectionDataSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+}).catchall(z.unknown());+export const Oauth2ConnectionDataSchema = z.discriminatedUnion('status', [Oauth2InitiatingConnectionDataSchema,Oauth2InitiatedConnectionDataSchema,Oauth2ActiveConnectionDataSchema,Oauth2FailedConnectionDataSchema,Oauth2ExpiredConnectionDataSchema,+ Oauth2InactiveConnectionDataSchema,]);export type Oauth2InitiatingConnectionData = z.infer<typeof Oauth2InitiatingConnectionDataSchema>;@@ -128,6 +134,7 @@ export type Oauth2InitiatedConnectionData = z.infer<typeof Oauth2InitiatedConnecexport type Oauth2ActiveConnectionData = z.infer<typeof Oauth2ActiveConnectionDataSchema>;export type Oauth2FailedConnectionData = z.infer<typeof Oauth2FailedConnectionDataSchema>;export type Oauth2ExpiredConnectionData = z.infer<typeof Oauth2ExpiredConnectionDataSchema>;+export type Oauth2InactiveConnectionData = z.infer<typeof Oauth2InactiveConnectionDataSchema>;export type Oauth2ConnectionData = z.infer<typeof Oauth2ConnectionDataSchema>;// OAUTH1@@ -137,16 +144,16 @@ export const Oauth1InitiatingConnectionDataSchema = BaseSchemeRaw.extend({export const Oauth1InitiatedConnectionDataSchema = Oauth1InitiatingConnectionDataSchema.extend({status: z.literal(ConnectionStatuses.INITIATED),- oauth_token: z.string(),- authUri: z.string(),- oauth_token_secret: z.string(),- redirectUrl: z.string(),+ oauth_token: z.string().optional(),+ authUri: z.string().optional(),+ oauth_token_secret: z.string().optional(),+ redirectUrl: z.string().optional(),callbackUrl: z.string().optional(),}).catchall(z.unknown());export const Oauth1ActiveConnectionDataSchema = Oauth1InitiatingConnectionDataSchema.extend({status: z.literal(ConnectionStatuses.ACTIVE),- oauth_token: z.string(),+ oauth_token: z.string().optional(),consumer_key: z.string().optional(),redirectUrl: z.string().optional(),callback_url: z.string().optional(),@@ -163,12 +170,17 @@ export const Oauth1ExpiredConnectionDataSchema = Oauth1InitiatingConnectionDataSexpired_at: z.string().optional(),}).catchall(z.unknown());+export const Oauth1InactiveConnectionDataSchema = Oauth1InitiatingConnectionDataSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+}).catchall(z.unknown());+export const Oauth1ConnectionDataSchema = z.discriminatedUnion('status', [Oauth1InitiatingConnectionDataSchema,Oauth1InitiatedConnectionDataSchema,Oauth1ActiveConnectionDataSchema,Oauth1FailedConnectionDataSchema,Oauth1ExpiredConnectionDataSchema,+ Oauth1InactiveConnectionDataSchema,]);export type Oauth1InitiatingConnectionData = z.infer<typeof Oauth1InitiatingConnectionDataSchema>;@@ -176,6 +188,7 @@ export type Oauth1InitiatedConnectionData = z.infer<typeof Oauth1InitiatedConnecexport type Oauth1ActiveConnectionData = z.infer<typeof Oauth1ActiveConnectionDataSchema>;export type Oauth1FailedConnectionData = z.infer<typeof Oauth1FailedConnectionDataSchema>;export type Oauth1ExpiredConnectionData = z.infer<typeof Oauth1ExpiredConnectionDataSchema>;+export type Oauth1InactiveConnectionData = z.infer<typeof Oauth1InactiveConnectionDataSchema>;export type Oauth1ConnectionData = z.infer<typeof Oauth1ConnectionDataSchema>;// COMPOSIO_LINK_AUTH@@ -200,6 +213,9 @@ export const ComposioLinkConnectionDataSchema = z.discriminatedUnion('status', [status: z.literal(ConnectionStatuses.EXPIRED),expired_at: z.string().optional(),}).catchall(z.unknown()),+ ComposioLinkInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),]);// BILLCOM_AUTH@@ -226,6 +242,9 @@ export const BillcomAuthConnectionDataSchema = z.discriminatedUnion('status', [status: z.literal(ConnectionStatuses.EXPIRED),expired_at: z.string().optional(),}).catchall(z.unknown()),+ BillcomAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),]);// BASIC@@ -234,7 +253,21 @@ const BasicInitiatingSchema = BaseSchemeRaw.extend({username: z.string(),password: z.string(),}).catchall(z.unknown());-const BasicConnectionDataSchema = BasicInitiatingSchema;+const BasicConnectionDataSchema = z.discriminatedUnion('status', [+ BasicInitiatingSchema,+ BasicInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ BasicInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ BasicInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// API_KEYconst ApiKeyInitiatingSchema = BaseSchemeRaw.extend({@@ -242,33 +275,103 @@ const ApiKeyInitiatingSchema = BaseSchemeRaw.extend({api_key: z.string().optional(),generic_api_key: z.string().optional(),}).catchall(z.unknown());-const ApiKeyConnectionDataSchema = ApiKeyInitiatingSchema;+const ApiKeyConnectionDataSchema = z.discriminatedUnion('status', [+ ApiKeyInitiatingSchema,+ ApiKeyInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ ApiKeyInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ ApiKeyInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// BEARER_TOKENconst BearerTokenInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),token: z.string(),}).catchall(z.unknown());-const BearerTokenConnectionDataSchema = BearerTokenInitiatingSchema;+const BearerTokenConnectionDataSchema = z.discriminatedUnion('status', [+ BearerTokenInitiatingSchema,+ BearerTokenInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ BearerTokenInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ BearerTokenInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// GOOGLE_SERVICE_ACCOUNTconst GoogleServiceAccountInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),credentials_json: z.string(),}).catchall(z.unknown());-const GoogleServiceAccountConnectionDataSchema = GoogleServiceAccountInitiatingSchema;+const GoogleServiceAccountConnectionDataSchema = z.discriminatedUnion('status', [+ GoogleServiceAccountInitiatingSchema,+ GoogleServiceAccountInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ GoogleServiceAccountInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ GoogleServiceAccountInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// NO_AUTHconst NoAuthInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),}).catchall(z.unknown());-const NoAuthConnectionDataSchema = NoAuthInitiatingSchema;+const NoAuthConnectionDataSchema = z.discriminatedUnion('status', [+ NoAuthInitiatingSchema,+ NoAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ NoAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ NoAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// CALCOM_AUTHconst CalcomAuthInitiatingSchema = BaseSchemeRaw.extend({status: z.literal(ConnectionStatuses.ACTIVE),}).catchall(z.unknown());-const CalcomAuthConnectionDataSchema = CalcomAuthInitiatingSchema;+const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', [+ CalcomAuthInitiatingSchema,+ CalcomAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ CalcomAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ CalcomAuthInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);// SNOWFLAKE// const SnowflakeInitiatingSchema = BaseSchemeRaw.extend({@@ -293,7 +396,21 @@ const BasicWithJwtInitiatingSchema = BaseSchemeRaw.extend({username: z.string(),password: z.string(),}).catchall(z.unknown());-const BasicWithJwtConnectionDataSchema = BasicWithJwtInitiatingSchema;+const BasicWithJwtConnectionDataSchema = z.discriminatedUnion('status', [+ BasicWithJwtInitiatingSchema,+ BasicWithJwtInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.INACTIVE),+ }).catchall(z.unknown()),+ BasicWithJwtInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.FAILED),+ error: z.string().optional(),+ error_description: z.string().optional(),+ }).catchall(z.unknown()),+ BasicWithJwtInitiatingSchema.extend({+ status: z.literal(ConnectionStatuses.EXPIRED),+ expired_at: z.string().optional(),+ }).catchall(z.unknown()),+]);export const ConnectionDataSchema = z.discriminatedUnion('authScheme', [z.object({diff --git a/ts/packages/core/src/types/connectedAccounts.types.ts b/ts/packages/core/src/types/connectedAccounts.types.tsindex 41f8602e6..357e3d534 100644--- a/ts/packages/core/src/types/connectedAccounts.types.ts+++ b/ts/packages/core/src/types/connectedAccounts.types.ts@@ -18,6 +18,7 @@ export const ConnectedAccountStatusSchema = z.enum([ConnectedAccountStatuses.ACTIVE,ConnectedAccountStatuses.FAILED,ConnectedAccountStatuses.EXPIRED,+ ConnectedAccountStatuses.INACTIVE,]);export type ConnectedAccountStatus =(typeof ConnectedAccountStatuses)[keyof typeof ConnectedAccountStatuses];@@ -72,7 +73,7 @@ export type ConnectedAccountAuthConfig = z.infer<typeof ConnectedAccountAuthConfexport const ConnectedAccountRetrieveResponseSchema = z.object({id: z.string(),authConfig: ConnectedAccountAuthConfigSchema,- data: z.record(z.string(), z.unknown()),+ data: z.record(z.string(), z.unknown()).optional(),params: z.record(z.string(), z.unknown()).optional(),status: ConnectedAccountStatusSchema,statusReason: z.string().nullable(),diff --git a/ts/packages/core/src/utils/transform.ts b/ts/packages/core/src/utils/transform.tsindex 96e5884d3..d88bf83cc 100644--- a/ts/packages/core/src/utils/transform.ts+++ b/ts/packages/core/src/utils/transform.ts@@ -11,8 +11,9 @@* .using((raw) => ({ ... }))* ```*/-import { ZodType, ZodTypeAny, z } from 'zod';+import { ZodTypeAny, z } from 'zod';import { ValidationError } from '../errors';+import { logger } from '..';export function transform<RawInput>(raw: RawInput) {return {@@ -26,12 +27,15 @@ export function transform<RawInput>(raw: RawInput) {const result = schema.safeParse(transformed);if (!result.success) {- throw new ValidationError(- `Failed to transform${options?.label ? ` ${options.label}` : ''}`,- {- cause: result.error,- }- );+ // @TODO:send telemetry here+ // throw new ValidationError(+ // `Failed to transform${options?.label ? ` ${options.label}` : ''}`,+ // {+ // cause: result.error,+ // }+ // );+ logger.error(result.error);+ return transformed;}return result.data;diff --git a/ts/packages/core/src/utils/transformers/authConfigs.ts b/ts/packages/core/src/utils/transformers/authConfigs.tsnew file mode 100644index 000000000..eeea656a0--- /dev/null+++ b/ts/packages/core/src/utils/transformers/authConfigs.ts@@ -0,0 +1,100 @@+import { logger } from '../..';+import {+ AuthConfigRetrieveResponse,+ AuthConfigRetrieveResponseSchema,+ AuthConfigListResponse,+ AuthConfigListResponseSchema,+ CreateAuthConfigResponse,+ CreateAuthConfigResponseSchema,+} from '../../types/authConfigs.types';++import {+ AuthConfigListResponse as RawAuthConfigListResponse,+ AuthConfigRetrieveResponse as RawAuthConfigRetrieveResponse,+ AuthConfigCreateResponse as RawCreateAuthConfigResponse,+} from '@composio/client/resources/auth-configs';+import { transform } from '../transform';++/**+ * Transforms an auth config response from API format to SDK format.+ *+ * This method converts property names from snake_case to camelCase and reorganizes+ * the data structure to match the SDK's standardized format for auth configurations.+ *+ * @param {RawAuthConfigRetrieveResponse} authConfig - The raw API response to transform+ * @returns {AuthConfigRetrieveResponse} The transformed auth config data+ *+ * @private+ */+export function transformAuthConfigRetrieveResponse(+ authConfig: RawAuthConfigRetrieveResponse+): AuthConfigRetrieveResponse {+ return transform(authConfig)+ .with(AuthConfigRetrieveResponseSchema)+ .using(authConfig => ({+ id: authConfig.id,+ name: authConfig.name,+ noOfConnections: authConfig.no_of_connections,+ status: authConfig.status,+ toolkit: {+ logo: authConfig.toolkit.logo,+ slug: authConfig.toolkit.slug,+ },+ uuid: authConfig.uuid,+ authScheme: authConfig.auth_scheme,+ credentials: authConfig.credentials,+ expectedInputFields: authConfig.expected_input_fields,+ isComposioManaged: authConfig.is_composio_managed,+ createdBy: authConfig.created_by,+ createdAt: authConfig.created_at,+ lastUpdatedAt: authConfig.last_updated_at,+ restrictToFollowingTools: authConfig.restrict_to_following_tools,+ }));+}++/**+ * Transforms the raw auth config list response from the Composio API to the SDK format.+ *+ * This method converts property names from snake_case to camelCase and reorganizes+ * the data structure to match the SDK's standardized format for auth configurations.+ *+ * @param {RawAuthConfigListResponse} response - The raw API response to transform+ * @returns {AuthConfigListResponse} The transformed response+ *+ * @private+ */+export function transformAuthConfigListResponse(+ response: RawAuthConfigListResponse+): AuthConfigListResponse {+ return transform(response)+ .with(AuthConfigListResponseSchema)+ .using(response => ({+ items: response.items.map(transformAuthConfigRetrieveResponse),+ nextCursor: response.next_cursor ?? null,+ totalPages: response.total_pages,+ }));+}++/**+ * Transforms the raw create auth config response from the Composio API to the SDK format.+ *+ * This method converts property names from snake_case to camelCase and reorganizes+ * the data structure to match the SDK's standardized format for auth configurations.+ *+ * @param {RawCreateAuthConfigResponse} response - The raw API response to transform+ * @returns {CreateAuthConfigResponse} The transformed response+ *+ * @private+ */+export function transformCreateAuthConfigResponse(+ response: RawCreateAuthConfigResponse+): CreateAuthConfigResponse {+ return transform(response)+ .with(CreateAuthConfigResponseSchema)+ .using(response => ({+ id: response.auth_config.id,+ authScheme: response.auth_config.auth_scheme,+ isComposioManaged: response.auth_config.is_composio_managed,+ toolkit: response.toolkit.slug,+ }));+}diff --git a/ts/packages/core/src/utils/transformers/connectedAccounts.ts b/ts/packages/core/src/utils/transformers/connectedAccounts.tsindex 071d553e6..924d14deb 100644--- a/ts/packages/core/src/utils/transformers/connectedAccounts.ts+++ b/ts/packages/core/src/utils/transformers/connectedAccounts.ts@@ -3,11 +3,14 @@ import {ConnectedAccountRetrieveResponse as RawConnectedAccountRetrieveResponse,} from '@composio/client/resources/connected-accounts';import {+ ConnectedAccountListResponse,+ ConnectedAccountListResponseSchema,ConnectedAccountRetrieveResponse,ConnectedAccountRetrieveResponseSchema,} from '../../types/connectedAccounts.types';import { ValidationError } from '../../errors';import logger from '../logger';+import { transform } from '../transform';/*** Transforms the raw connected account response from the Composio API to the SDK format.@@ -24,30 +27,47 @@ import logger from '../logger';export function transformConnectedAccountResponse(response: RawConnectedAccountRetrieveResponse | RawConnectedAccountListResponse['items'][0]): ConnectedAccountRetrieveResponse {- const responseToParse = {- ...response,- authConfig: {- ...response.auth_config,- id: response.auth_config.id,- isComposioManaged: response.auth_config.is_composio_managed,- isDisabled: response.auth_config.is_disabled,- },- state: response.state,- status: response.status,- statusReason: response.status_reason,- isDisabled: response.is_disabled,- createdAt: response.created_at,- updatedAt: response.updated_at,- testRequestEndpoint: response.test_request_endpoint,- };- const result = ConnectedAccountRetrieveResponseSchema.safeParse(responseToParse);- if (!result.success) {- logger.error('Failed to parse connected account retrieve response', {- cause: result.error,- });- // this is a fallback for when the response is not valid, it will return the response as is- // ideally to not break the app if there are some issues with the response, fields missing etc- return responseToParse as unknown as ConnectedAccountRetrieveResponse;- }- return result.data;+ return transform(response)+ .with(ConnectedAccountRetrieveResponseSchema)+ .using(response => ({+ ...response,+ authConfig: {+ ...response.auth_config,+ id: response.auth_config.id,+ isComposioManaged: response.auth_config.is_composio_managed,+ isDisabled: response.auth_config.is_disabled,+ },+ data: (response as unknown as ConnectedAccountRetrieveResponse).data ?? undefined,+ state: response.state,+ status: response.status,+ statusReason: response.status_reason,+ isDisabled: response.is_disabled,+ createdAt: response.created_at,+ updatedAt: response.updated_at,+ testRequestEndpoint: response.test_request_endpoint,+ }));+}++/**+ * Transforms the raw connected account list response from the Composio API to the SDK format.+ *+ * This method converts property names from snake_case to camelCase and reorganizes+ * the data structure to match the SDK's standardized format.+ *+ * @param {RawConnectedAccountListResponse} response - The raw API response to transform+ * @returns {ConnectedAccountListResponse} The transformed response+ * @throws {ZodError} If the response fails validation against the expected schema+ *+ * @private+ */+export function transformConnectedAccountListResponse(+ response: RawConnectedAccountListResponse+): ConnectedAccountListResponse {+ return transform(response)+ .with(ConnectedAccountListResponseSchema)+ .using(response => ({+ items: response.items.map(transformConnectedAccountResponse),+ nextCursor: response.next_cursor ?? null,+ totalPages: response.total_pages,+ }));}diff --git a/ts/packages/core/src/utils/transformers/toolkits.ts b/ts/packages/core/src/utils/transformers/toolkits.tsnew file mode 100644index 000000000..8680eb05b--- /dev/null+++ b/ts/packages/core/src/utils/transformers/toolkits.ts@@ -0,0 +1,96 @@+import {+ ToolkitRetrieveResponse as RawToolkitRetrieveResponse,+ ToolkitListResponse as RawToolkitListResponse,+ ToolkitRetrieveCategoriesResponse as RawToolkitRetrieveCategoriesResponse,+} from '@composio/client/resources/toolkits';+import {+ ToolKitListResponse,+ ToolKitListResponseSchema,+ ToolkitRetrieveResponse,+ ToolkitRetrieveResponseSchema,+ ToolkitRetrieveCategoriesResponse,+ ToolkitRetrieveCategoriesResponseSchema,+} from '../../types/toolkit.types';+import { transform } from '../transform';++export const transformToolkitListResponse = (+ response: RawToolkitListResponse+): ToolKitListResponse => {+ return transform(response)+ .with(ToolKitListResponseSchema)+ .using(response =>+ response.items.map(item => ({+ name: item.name,+ slug: item.slug,+ meta: {+ ...item.meta,+ categories: item.meta.categories?.map(category => ({+ slug: category.id,+ name: category.name,+ })),+ createdAt: item.meta.created_at,+ description: item.meta.description,+ logo: item.meta.logo,+ toolsCount: item.meta.tools_count,+ triggersCount: item.meta.triggers_count,+ updatedAt: item.meta.updated_at,+ appUrl: item.meta.app_url ?? undefined,+ },+ isLocalToolkit: item.is_local_toolkit,+ authSchemes: item.auth_schemes,+ composioManagedAuthSchemes: item.composio_managed_auth_schemes,+ noAuth: item.no_auth,+ }))+ );+};++export const transformToolkitRetrieveResponse = (+ response: RawToolkitRetrieveResponse+): ToolkitRetrieveResponse => {+ return transform(response)+ .with(ToolkitRetrieveResponseSchema)+ .using(response => ({+ name: response.name,+ slug: response.slug,+ meta: {+ ...response.meta,+ createdAt: response.meta.created_at,+ updatedAt: response.meta.updated_at,+ toolsCount: response.meta.tools_count,+ triggersCount: response.meta.triggers_count,+ categories: response.meta.categories?.map(category => ({+ slug: category.slug,+ name: category.name,+ })),+ // appUrl: response.meta.app_url, @TODO Update the client type to include this+ },+ isLocalToolkit: response.is_local_toolkit,+ composioManagedAuthSchemes: response.composio_managed_auth_schemes,+ authConfigDetails: response.auth_config_details?.map(authConfig => ({+ name: authConfig.name,+ mode: authConfig.mode,+ fields: {+ authConfigCreation: authConfig.fields.auth_config_creation,+ connectedAccountInitiation: authConfig.fields.connected_account_initiation,+ },+ proxy: {+ baseUrl: authConfig.proxy?.base_url,+ },+ })),+ }));+};++export const transformToolkitRetrieveCategoriesResponse = (+ response: RawToolkitRetrieveCategoriesResponse+): ToolkitRetrieveCategoriesResponse => {+ return transform(response)+ .with(ToolkitRetrieveCategoriesResponseSchema)+ .using(response => ({+ items: response.items.map(item => ({+ id: item.id,+ name: item.name,+ })),+ nextCursor: response.next_cursor ?? null,+ totalPages: response.total_pages,+ }));+};diff --git a/ts/packages/core/src/utils/transformers/triggers.ts b/ts/packages/core/src/utils/transformers/triggers.tsnew file mode 100644index 000000000..7c0b2d458--- /dev/null+++ b/ts/packages/core/src/utils/transformers/triggers.ts@@ -0,0 +1,117 @@+import {+ TriggersTypeRetrieveResponse as RawTriggersTypeRetrieveResponse,+ TriggersTypeListResponse as RawTriggersTypeListResponse,+} from '@composio/client/resources/triggers-types';+import { TriggerInstanceListActiveResponse as RawTriggerInstanceListActiveResponse } from '@composio/client/resources/index';+import {+ IncomingTriggerPayload,+ IncomingTriggerPayloadSchema,+ TriggerData,+ TriggersTypeRetrieveResponse,+ TriggerTypeSchema,+ TriggersTypeListResponse,+ TriggersTypeListResponseSchema,+ TriggerInstanceListActiveResponse,+ TriggerInstanceListActiveResponseSchema,+ TriggerInstanceListActiveResponseItem,+ TriggerInstanceListActiveResponseItemSchema,+} from '../../types/triggers.types';+import { transform } from '../transform';++export function transformIncomingTriggerPayload(response: TriggerData): IncomingTriggerPayload {+ return transform(response)+ .with(IncomingTriggerPayloadSchema)+ .using(response => ({+ id: response.metadata.nanoId,+ uuid: response.metadata.id,+ triggerSlug: response.metadata.triggerName,+ toolkitSlug: response.appName,+ userId: response.metadata.connection?.clientUniqueUserId,+ payload: response.payload,+ originalPayload: response.originalPayload,+ metadata: {+ id: response.metadata.nanoId,+ uuid: response.metadata.id,+ triggerConfig: response.metadata.triggerConfig,+ triggerSlug: response.metadata.triggerName,+ toolkitSlug: response.appName,+ triggerData: response.metadata.triggerData,+ connectedAccount: {+ id: response.metadata.connection?.connectedAccountNanoId,+ uuid: response.metadata.connection?.id,+ authConfigId: response.metadata.connection?.authConfigNanoId,+ authConfigUUID: response.metadata.connection?.integrationId,+ userId: response.metadata.connection?.clientUniqueUserId,+ status: response.metadata.connection?.status as 'ACTIVE' | 'INACTIVE',+ },+ },+ }));+}++export function transformTriggerTypeRetrieveResponse(+ response: RawTriggersTypeRetrieveResponse+): TriggersTypeRetrieveResponse {+ return transform(response)+ .with(TriggerTypeSchema)+ .using(response => ({+ slug: response.slug,+ name: response.name,+ description: response.description,+ instructions: response.instructions,+ toolkit: {+ logo: response.toolkit.logo,+ slug: response.toolkit.slug,+ name: response.toolkit.name,+ },+ payload: response.payload,+ config: response.config,+ }));+}++export function transformTriggerTypeListResponse(+ response: RawTriggersTypeListResponse+): TriggersTypeListResponse {+ return transform(response)+ .with(TriggersTypeListResponseSchema)+ .using(response => ({+ items: response.items,+ nextCursor: response.next_cursor ?? null,+ totalPages: response.total_pages,+ }));+}++/**+ * Parse the trigger instance list active item+ *+ * @param response - The response from the composio client+ * @returns The parsed trigger instance list active item+ */+export function transformTriggerInstanceListActiveItem(+ response: RawTriggerInstanceListActiveResponse['items'][0]+): TriggerInstanceListActiveResponseItem {+ return transform(response)+ .with(TriggerInstanceListActiveResponseItemSchema)+ .using(response => ({+ id: response.id,+ connectedAccountId: response.connected_account_id,+ disabledAt: response.disabled_at,+ state: response.state,+ triggerConfig: response.trigger_config,+ triggerName: response.trigger_name,+ updatedAt: response.updated_at,+ triggerData: response.trigger_data,+ uuid: response.uuid,+ }));+}++export function transformTriggerInstanceListActiveResponse(+ response: RawTriggerInstanceListActiveResponse+): TriggerInstanceListActiveResponse {+ return transform(response)+ .with(TriggerInstanceListActiveResponseSchema)+ .using(response => ({+ items: response.items.map(item => transformTriggerInstanceListActiveItem(item)),+ nextCursor: response.next_cursor ?? null,+ totalPages: response.total_pages,+ }));+}diff --git a/ts/packages/core/test/AuthConfigs/authConfigs.test.ts b/ts/packages/core/test/AuthConfigs/authConfigs.test.tsindex 03cfacd0b..fa741b268 100644--- a/ts/packages/core/test/AuthConfigs/authConfigs.test.ts+++ b/ts/packages/core/test/AuthConfigs/authConfigs.test.ts@@ -9,6 +9,7 @@ import {AuthConfigUpdateResponse,AuthConfigUpdateStatusResponse,} from '@composio/client/resources/auth-configs';+import { transformAuthConfigRetrieveResponse } from '../../src/utils/transformers/authConfigs';// Mock data for testingconst mockComposioAuthConfigResponse: ComposioAuthConfigRetrieveResponse = {@@ -101,8 +102,7 @@ describe('AuthConfigs', () => {describe('parseAuthConfigRetrieveResponse', () => {it('should transform API response to SDK format correctly', () => {- // @ts-expect-error - Accessing private method for testing- const result = authConfigs.parseAuthConfigRetrieveResponse(mockComposioAuthConfigResponse);+ const result = transformAuthConfigRetrieveResponse(mockComposioAuthConfigResponse);expect(result).toEqual(mockTransformedAuthConfigResponse);});@@ -137,8 +137,7 @@ describe('AuthConfigs', () => {// Optional fields omitted} as ComposioAuthConfigRetrieveResponse;- // @ts-expect-error - Accessing private method for testing- const result = authConfigs.parseAuthConfigRetrieveResponse(responseWithOptionalFields);+ const result = transformAuthConfigRetrieveResponse(responseWithOptionalFields);expect(result).toMatchObject({id: 'auth_12345',name: 'Test Auth Config',@@ -216,23 +215,6 @@ describe('AuthConfigs', () => {).rejects.toThrow(); // Just expect any error since Zod throws ZodError directly});- it('should throw ValidationError when API response is invalid', async () => {- const invalidResponse = {- items: [- {- ...mockComposioAuthConfigResponse,- id: null, // Invalid response structure- },- ],- next_cursor: 'next_cursor_123',- total_pages: 1,- };-- mockClient.authConfigs.list.mockResolvedValueOnce(invalidResponse);-- await expect(authConfigs.list()).rejects.toThrow(ValidationError);- });-it('should handle empty list response', async () => {const emptyResponse = {items: [],@@ -364,23 +346,6 @@ describe('AuthConfigs', () => {authConfigs.create('github', invalidOptions)).rejects.toThrow(ValidationError);});-- it('should throw ValidationError when API response is invalid', async () => {- const invalidResponse = {- auth_config: {- id: null, // Invalid response structure- auth_scheme: 'OAUTH2',- is_composio_managed: true,- },- toolkit: {- slug: 'github',- },- };-- mockClient.authConfigs.create.mockResolvedValueOnce(invalidResponse);-- await expect(authConfigs.create('github')).rejects.toThrow(ValidationError);- });});describe('get', () => {@@ -660,35 +625,6 @@ describe('AuthConfigs', () => {await expect(authConfigs.list()).rejects.toThrow('Network error');});-- it('should handle malformed API responses', async () => {- // Response missing required fields- const malformedResponse = {- items: [- {- id: 'test_id',- name: null, // Invalid: name should be string- no_of_connections: 5,- status: 'ENABLED',- deprecated_params: {- default_connector_id: null,- },- type: 'custom',- toolkit: {- logo: 'logo',- slug: 'slug',- },- uuid: 'uuid-123',- },- ],- next_cursor: 'cursor',- total_pages: 1,- };-- mockClient.authConfigs.list.mockResolvedValueOnce(malformedResponse);-- await expect(authConfigs.list()).rejects.toThrow(ValidationError);- });});describe('edge cases', () => {@@ -709,8 +645,7 @@ describe('AuthConfigs', () => {uuid: 'uuid-minimal',} as ComposioAuthConfigRetrieveResponse;- // @ts-expect-error - Accessing private method for testing- const result = authConfigs.parseAuthConfigRetrieveResponse(minimalResponse);+ const result = transformAuthConfigRetrieveResponse(minimalResponse);expect(result).toMatchObject({id: 'auth_minimal',diff --git a/ts/packages/core/test/models/triggers.test.ts b/ts/packages/core/test/models/triggers.test.tsindex 1c0fdeb98..f64c04dd6 100644--- a/ts/packages/core/test/models/triggers.test.ts+++ b/ts/packages/core/test/models/triggers.test.ts@@ -260,14 +260,6 @@ describe('Triggers', () => {});});- it('should throw validation error for invalid response', async () => {- mockClient.triggerInstances.listActive.mockResolvedValue({- items: [{ invalid: 'data' }],- });-- await expect(triggers.listActive()).rejects.toThrow(ValidationError);- });-it('should list active trigger instances with query parameters', async () => {const query = {authConfigIds: ['auth-1'],@@ -402,17 +394,6 @@ describe('Triggers', () => {);expect(mockClient.triggerInstances.upsert).not.toHaveBeenCalled();});-- it('should throw validation error for invalid upsert response', async () => {- mockClient.connectedAccounts.list.mockResolvedValue({- items: [{ id: 'conn-123' }],- });- mockClient.triggerInstances.upsert.mockResolvedValue({- invalid_field: 'value',- });-- await expect(triggers.create(userId, slug, body)).rejects.toThrow(ValidationError);- });});describe('update', () => {@@ -438,13 +419,6 @@ describe('Triggers', () => {expect(mockClient.triggerInstances.manage.delete).toHaveBeenCalledWith(triggerId);expect(result).toEqual({ triggerId: mockTriggerDeleteResponse.trigger_id });});-- it('should throw validation error for invalid response', async () => {- const triggerId = 'trigger-123';- mockClient.triggerInstances.manage.delete.mockResolvedValue({ invalid: 'response' });-- await expect(triggers.delete(triggerId)).rejects.toThrow(ValidationError);- });});describe('disable', () => {@@ -702,26 +676,6 @@ describe('Triggers', () => {);});- it('should handle invalid trigger data format', async () => {- const invalidTriggerData = {- appName: 'github',- clientId: 123,- payload: { action: 'push' },- originalPayload: { action: 'push' },- metadata: {- triggerName: 'github_webhook',- },- };-- await triggers.subscribe(mockCallback);-- const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];- const filterCallback = subscribeCall[0];-- expect(() => filterCallback(invalidTriggerData)).toThrow(ValidationError);- expect(mockCallback).not.toHaveBeenCalled();- });-it('should handle partial trigger data with missing optional fields', async () => {const partialTriggerData = {appName: 'github',@@ -943,26 +897,6 @@ describe('Triggers', () => {);});- it('should handle invalid trigger data format', async () => {- const invalidTriggerData = {- appName: 'github',- clientId: 123,- payload: { action: 'push' },- originalPayload: { action: 'push' },- metadata: {- triggerName: 'github_webhook',- },- };-- await triggers.subscribe(mockCallback);-- const subscribeCall = vi.mocked(mockPusherService.subscribe).mock.calls[0];- const filterCallback = subscribeCall[0];-- expect(() => filterCallback(invalidTriggerData)).toThrow(ValidationError);- expect(mockCallback).not.toHaveBeenCalled();- });-it('should handle multiple callbacks with different filters', async () => {const callback1 = vi.fn();const callback2 = vi.fn();diff --git a/ts/packages/providers/anthropic/CHANGELOG.md b/ts/packages/providers/anthropic/CHANGELOG.mdindex d256388ca..9e2b6807a 100644--- a/ts/packages/providers/anthropic/CHANGELOG.md+++ b/ts/packages/providers/anthropic/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/anthropic+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/anthropic/package.json b/ts/packages/providers/anthropic/package.jsonindex fbe3ce6b4..1c4fdd9d9 100644--- a/ts/packages/providers/anthropic/package.json+++ b/ts/packages/providers/anthropic/package.json@@ -1,6 +1,6 @@{"name": "@composio/anthropic",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "Non-Agentic Provider for Anthropic in Composio SDK","main": "src/index.ts","type": "module",@@ -35,7 +35,7 @@"packageManager": "[email protected]","peerDependencies": {"@anthropic-ai/sdk": "^0.52.0",- "@composio/core": "0.1.36-next.9"+ "@composio/core": "0.1.36-next.10"},"devDependencies": {"@composio/core": "workspace:*",diff --git a/ts/packages/providers/cloudflare/CHANGELOG.md b/ts/packages/providers/cloudflare/CHANGELOG.mdindex 7c5020853..35ec60ccf 100644--- a/ts/packages/providers/cloudflare/CHANGELOG.md+++ b/ts/packages/providers/cloudflare/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/cloudflare+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/cloudflare/package.json b/ts/packages/providers/cloudflare/package.jsonindex 36f68edee..1edff9f13 100644--- a/ts/packages/providers/cloudflare/package.json+++ b/ts/packages/providers/cloudflare/package.json@@ -1,6 +1,6 @@{"name": "@composio/cloudflare",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "src/index.ts","type": "module",@@ -31,7 +31,7 @@"packageManager": "[email protected]","peerDependencies": {"@cloudflare/workers-types": "^4.20250416.0",- "@composio/core": "0.1.36-next.9"+ "@composio/core": "0.1.36-next.10"},"devDependencies": {"@composio/core": "workspace:*",diff --git a/ts/packages/providers/google/CHANGELOG.md b/ts/packages/providers/google/CHANGELOG.mdindex 44662427f..b6e6b4714 100644--- a/ts/packages/providers/google/CHANGELOG.md+++ b/ts/packages/providers/google/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/google+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/google/package.json b/ts/packages/providers/google/package.jsonindex 34ab1f7a4..6b804a845 100644--- a/ts/packages/providers/google/package.json+++ b/ts/packages/providers/google/package.json@@ -1,6 +1,6 @@{"name": "@composio/google",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "Google GenAI Provider for Composio SDK","main": "src/index.ts","type": "module",@@ -36,7 +36,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","@google/genai": "^1.1.0"},"devDependencies": {diff --git a/ts/packages/providers/langchain/CHANGELOG.md b/ts/packages/providers/langchain/CHANGELOG.mdindex 717fbf36c..f1a7770dd 100644--- a/ts/packages/providers/langchain/CHANGELOG.md+++ b/ts/packages/providers/langchain/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/langchain+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/langchain/package.json b/ts/packages/providers/langchain/package.jsonindex 5fda37b06..37fb890ca 100644--- a/ts/packages/providers/langchain/package.json+++ b/ts/packages/providers/langchain/package.json@@ -1,6 +1,6 @@{"name": "@composio/langchain",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "dist/index.js","type": "module",@@ -30,7 +30,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","@langchain/core": "^0.3.44"},"devDependencies": {diff --git a/ts/packages/providers/mastra/CHANGELOG.md b/ts/packages/providers/mastra/CHANGELOG.mdindex 40e8a1e0a..caa39dd53 100644--- a/ts/packages/providers/mastra/CHANGELOG.md+++ b/ts/packages/providers/mastra/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/mastra+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/mastra/package.json b/ts/packages/providers/mastra/package.jsonindex a22e1ea6d..012a5d8b2 100644--- a/ts/packages/providers/mastra/package.json+++ b/ts/packages/providers/mastra/package.json@@ -1,6 +1,6 @@{"name": "@composio/mastra",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "Agentic Provider for mastra in Composio SDK","main": "src/index.ts","type": "module",@@ -34,7 +34,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","@mastra/core": "^0.10.0"},"devDependencies": {diff --git a/ts/packages/providers/openai-agents/CHANGELOG.md b/ts/packages/providers/openai-agents/CHANGELOG.mdindex 68dc3e128..352c3ab4a 100644--- a/ts/packages/providers/openai-agents/CHANGELOG.md+++ b/ts/packages/providers/openai-agents/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/vercel+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/openai-agents/package.json b/ts/packages/providers/openai-agents/package.jsonindex 8a31c10a7..9871b6ddd 100644--- a/ts/packages/providers/openai-agents/package.json+++ b/ts/packages/providers/openai-agents/package.json@@ -1,6 +1,6 @@{"name": "@composio/openai-agents",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "src/index.ts","type": "module",@@ -30,7 +30,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","@openai/agents": "^0.0.7"},"devDependencies": {diff --git a/ts/packages/providers/openai/CHANGELOG.md b/ts/packages/providers/openai/CHANGELOG.mdindex b07034734..f692d41f2 100644--- a/ts/packages/providers/openai/CHANGELOG.md+++ b/ts/packages/providers/openai/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/openai+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/openai/package.json b/ts/packages/providers/openai/package.jsonindex db3128efa..6c3f50e32 100644--- a/ts/packages/providers/openai/package.json+++ b/ts/packages/providers/openai/package.json@@ -1,6 +1,6 @@{"name": "@composio/openai",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "src/index.ts","type": "module",@@ -30,7 +30,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","openai": "^4.3.8"},"devDependencies": {diff --git a/ts/packages/providers/vercel/CHANGELOG.md b/ts/packages/providers/vercel/CHANGELOG.mdindex 68dc3e128..352c3ab4a 100644--- a/ts/packages/providers/vercel/CHANGELOG.md+++ b/ts/packages/providers/vercel/CHANGELOG.md@@ -1,5 +1,13 @@# @composio/vercel+## 0.1.36-next.10++### Patch Changes++- Fix: Relax strict type/schema validations on API responses+- Updated dependencies+ - @composio/[email protected]+## 0.1.36-next.9### Patch Changesdiff --git a/ts/packages/providers/vercel/package.json b/ts/packages/providers/vercel/package.jsonindex a9b42f3ec..6fbda86b8 100644--- a/ts/packages/providers/vercel/package.json+++ b/ts/packages/providers/vercel/package.json@@ -1,6 +1,6 @@{"name": "@composio/vercel",- "version": "0.1.36-next.9",+ "version": "0.1.36-next.10","description": "","main": "src/index.ts","type": "module",@@ -30,7 +30,7 @@"license": "ISC","packageManager": "[email protected]","peerDependencies": {- "@composio/core": "0.1.36-next.9",+ "@composio/core": "0.1.36-next.10","ai": "^4.3.8"},"devDependencies": {diff --git a/turbo.json b/turbo.jsonindex e7adfbc3d..fe44a8d16 100644--- a/turbo.json+++ b/turbo.json@@ -12,6 +12,10 @@"clean": {"cache": false},+ "typecheck": {+ "dependsOn": ["^build"],+ "cache": false+ },"//#clean": {"cache": false}