Skip to content

Commit

Permalink
Fix typescript issues in Destinations and CLI (#2725)
Browse files Browse the repository at this point in the history
  • Loading branch information
sayan-das-in authored Feb 5, 2025
1 parent 25a5473 commit 56e9fc2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
8 changes: 4 additions & 4 deletions packages/cli/src/commands/generate/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default class GenerateAction extends Command {
)
this.spinner.succeed(`Scaffold action`)
} catch (err) {
this.spinner.fail(`Scaffold action: ${chalk.red(err.message)}`)
this.spinner.fail(`Scaffold action: ${chalk.red((err as Error).message)}`)
this.exit()
}

Expand All @@ -127,7 +127,7 @@ export default class GenerateAction extends Command {
)
this.spinner.succeed(`Creating snapshot tests for ${chalk.bold(`${destination}'s ${slug}`)} destination action`)
} catch (err) {
this.spinner.fail(`Snapshot test creation failed: ${chalk.red(err.message)}`)
this.spinner.fail(`Snapshot test creation failed: ${chalk.red((err as Error).message)}`)
this.exit()
}
}
Expand All @@ -142,7 +142,7 @@ export default class GenerateAction extends Command {
fs.writeFileSync(entryFile, updatedCode, 'utf8')
this.spinner.succeed()
} catch (err) {
this.spinner.fail(chalk`Failed to update your destination imports: ${err.message}`)
this.spinner.fail(chalk`Failed to update your destination imports: ${(err as Error).message}`)
this.exit()
}

Expand All @@ -151,7 +151,7 @@ export default class GenerateAction extends Command {
await GenerateTypes.run(['--path', entryFile])
this.spinner.succeed()
} catch (err) {
this.spinner.fail(chalk`Generating types for {magenta ${slug}} action: ${err.message}`)
this.spinner.fail(chalk`Generating types for {magenta ${slug}} action: ${(err as Error).message}`)
this.exit()
}

Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/commands/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default class Init extends Command {
renderTemplates(templatePath, targetDirectory, { ...answers, slugWithoutActions })
this.spinner.succeed(`Scaffold integration`)
} catch (err) {
this.spinner.fail(`Scaffold integration: ${chalk.red(err.message)}`)
this.spinner.fail(`Scaffold integration: ${chalk.red((err as Error).message)}`)
this.exit()
}

Expand All @@ -140,7 +140,7 @@ export default class Init extends Command {
await GenerateTypes.run(['--path', entryPath])
this.spinner.succeed()
} catch (err) {
this.spinner.fail(chalk`Generating types for {magenta ${slug}} destination: ${err.message}`)
this.spinner.fail(chalk`Generating types for {magenta ${slug}} destination: ${(err as Error).message}`)
}

if (!isBrowserTemplate) {
Expand All @@ -156,7 +156,7 @@ export default class Init extends Command {
)
this.spinner.succeed(`Created snapshot tests for ${slug} destination`)
} catch (err) {
this.spinner.fail(`Snapshot test creation failed: ${chalk.red(err.message)}`)
this.spinner.fail(`Snapshot test creation failed: ${chalk.red((err as Error).message)}`)
this.exit()
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IntegrationError, RequestClient, StatsContext } from '@segment/actions-core'
import { IntegrationError, RequestClient, StatsContext, HTTPError } from '@segment/actions-core'
import { OAUTH_URL, USER_UPLOAD_ENDPOINT, SEGMENT_DMP_ID } from './constants'
import type { RefreshTokenResponse } from './types'

Expand Down Expand Up @@ -197,11 +197,15 @@ export const sendUpdateRequest = async (

await bulkUploaderResponseHandler(response, statsName, statsContext)
} catch (error) {
if (error.response?.status === 500) {
throw new IntegrationError(error.response.message, 'INTERNAL_SERVER_ERROR', 500)
if ((error as HTTPError).response?.status === 500) {
throw new IntegrationError(
(error as unknown as any).response?.message ?? (error as HTTPError).message,
'INTERNAL_SERVER_ERROR',
500
)
}

await bulkUploaderResponseHandler(error.response, statsName, statsContext)
await bulkUploaderResponseHandler((error as HTTPError).response, statsName, statsContext)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionDefinition, RequestClient, RetryableError } from '@segment/actions-core'
import { ActionDefinition, RequestClient, RetryableError, HTTPError } from '@segment/actions-core'
import type { Settings } from '../generated-types'
import { convertValidTimestamp, getUniqueIntercomContact } from '../util'
import type { Payload } from './generated-types'
Expand Down Expand Up @@ -129,7 +129,7 @@ const action: ActionDefinition<Settings, Payload> = {
}
return await createIntercomContact(request, payload)
} catch (error) {
if (error?.response?.status === 409) {
if ((error as HTTPError)?.response?.status === 409) {
// The contact already exists but the Intercom cache most likely wasn't updated yet
throw new RetryableError(
'Contact was reported duplicated but could not be searched for, probably due to Intercom search cache not being updated'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RequestClient } from '@segment/actions-core'
import { RequestClient, HTTPError, DynamicFieldResponse } from '@segment/actions-core'
import { VisitorAttribute, Event, ProjectConfig } from '../types'
import type { Settings } from '../generated-types'
import reduceRight from 'lodash/reduceRight'
Expand Down Expand Up @@ -51,7 +51,7 @@ function isValidValue(value: unknown) {
return ['string', 'number', 'boolean'].includes(typeof value)
}

export async function getEventKeys(request: RequestClient, settings: Settings) {
export async function getEventKeys(request: RequestClient, settings: Settings): Promise<DynamicFieldResponse> {
try {
const response = await request<ProjectConfig>(settings.dataFileUrl, {
skipResponseCloning: true
Expand All @@ -67,8 +67,8 @@ export async function getEventKeys(request: RequestClient, settings: Settings) {
return {
choices: [],
error: {
message: err?.response?.statusText ?? 'Unknown error',
code: err?.response?.status ?? 'Unknown code'
message: (err as HTTPError)?.response?.statusText ?? 'Unknown error',
code: `${(err as HTTPError)?.response?.status ?? 'Unknown code'}`
}
}
}
Expand Down

0 comments on commit 56e9fc2

Please sign in to comment.