Skip to content

Conversation

panteliselef
Copy link
Member

@panteliselef panteliselef commented Oct 10, 2025

Description

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Refactor
    • Standardized billing and checkout terminology from “payment source” to “payment method,” aligning endpoints and payloads; no visible UI changes expected.
  • Tests
    • Updated test data and plan identifiers to reflect the “payment method” terminology.
  • Chores
    • Added a placeholder changeset file with no functional impact.

@panteliselef panteliselef self-assigned this Oct 10, 2025
Copy link

changeset-bot bot commented Oct 10, 2025

🦋 Changeset detected

Latest commit: ebdd8e6

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 0 packages

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

vercel bot commented Oct 10, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
clerk-js-sandbox Ready Ready Preview Comment Oct 10, 2025 9:30pm

Copy link
Contributor

coderabbitai bot commented Oct 10, 2025

Walkthrough

Refactors billing API calls to use a centralized Billing.path and updates payload keys from payment_source to payment_method. Renames related properties in hooks and tests. Adjusts a JSON discriminator string for initialized payment methods. Adds a no-op changeset file.

Changes

Cohort / File(s) Summary
Billing API refactor
packages/clerk-js/src/core/resources/BillingPaymentSource.ts
Switches endpoint construction to Billing.path for delete and makeDefault; updates payload key to payment_method_id and targets new paths.
Checkout tests alignment
packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
Renames fixture field paymentSource → paymentMethod; updates plan IDs from plan_with_payment_sources to plan_with_payment_methods.
Hook return shape rename
packages/shared/src/react/hooks/useCheckout.ts
Changes null-state property from paymentSource to paymentMethod in the checkout return structure.
Types discriminator update
packages/types/src/json.ts
Changes object discriminator to 'commerce_payment_method_initialize' in BillingInitializedPaymentMethodJSON.
Changeset placeholder
.changeset/kind-ghosts-smile.md
Adds empty changeset file with only delimiters; no functional impact.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

I nibble on diffs with a coder’s delight,
Hop! From source to method, names set right.
Paths now align where the APIs tread,
Tests keep pace, green carrots ahead.
Types whisper “initialize” anew—
Small hops, clean crops, repo feels brand new. 🥕🐇

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The pull request title clearly describes the primary change of updating payment source endpoints in both clerk-js and types packages, matching the adjustments to endpoint paths and payload keys without including extraneous details.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch elef/bill-1264-payment-method-class-update-endpoints

Comment @coderabbitai help to get the list of available commands and usage tips.

Comment on lines 1 to 2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have changesets in main for this.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 0835ee7 and ebdd8e6.

📒 Files selected for processing (5)
  • .changeset/kind-ghosts-smile.md (1 hunks)
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts (3 hunks)
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx (4 hunks)
  • packages/shared/src/react/hooks/useCheckout.ts (1 hunks)
  • packages/types/src/json.ts (1 hunks)
🧰 Additional context used
📓 Path-based instructions (14)
**/*.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{js,jsx,ts,tsx}: All code must pass ESLint checks with the project's configuration
Follow established naming conventions (PascalCase for components, camelCase for variables)
Maintain comprehensive JSDoc comments for public APIs
Use dynamic imports for optional features
All public APIs must be documented with JSDoc
Provide meaningful error messages to developers
Include error recovery suggestions where applicable
Log errors appropriately for debugging
Lazy load components and features when possible
Implement proper caching strategies
Use efficient data structures and algorithms
Profile and optimize critical paths
Validate all inputs and sanitize outputs
Implement proper logging with different levels

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
**/*.{js,jsx,ts,tsx,json,css,scss,md,yaml,yml}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use Prettier for consistent code formatting

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
packages/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

TypeScript is required for all packages

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
packages/**/*.{ts,tsx,d.ts}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Packages should export TypeScript types alongside runtime code

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use proper TypeScript error types

**/*.{ts,tsx}: Always define explicit return types for functions, especially public APIs
Use proper type annotations for variables and parameters where inference isn't clear
Avoid any type - prefer unknown when type is uncertain, then narrow with type guards
Use interface for object shapes that might be extended
Use type for unions, primitives, and computed types
Prefer readonly properties for immutable data structures
Use private for internal implementation details
Use protected for inheritance hierarchies
Use public explicitly for clarity in public APIs
Prefer readonly for properties that shouldn't change after construction
Prefer composition and interfaces over deep inheritance chains
Use mixins for shared behavior across unrelated classes
Implement dependency injection for loose coupling
Let TypeScript infer when types are obvious
Use const assertions for literal types: as const
Use satisfies operator for type checking without widening
Use mapped types for transforming object types
Use conditional types for type-level logic
Leverage template literal types for string manipulation
Use ES6 imports/exports consistently
Use default exports sparingly, prefer named exports
Use type-only imports: import type { ... } from ...
No any types without justification
Proper error handling with typed errors
Consistent use of readonly for immutable data
Proper generic constraints
No unused type parameters
Proper use of utility types instead of manual type construction
Type-only imports where possible
Proper tree-shaking friendly exports
No circular dependencies
Efficient type computations (avoid deep recursion)

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
**/*.{js,ts,tsx,jsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Support multiple Clerk environment variables (CLERK_, NEXT_PUBLIC_CLERK_, etc.) for configuration.

Files:

  • packages/types/src/json.ts
  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
  • packages/clerk-js/src/core/resources/BillingPaymentSource.ts
  • packages/shared/src/react/hooks/useCheckout.ts
.changeset/**

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Automated releases must use Changesets.

Files:

  • .changeset/kind-ghosts-smile.md
packages/clerk-js/src/ui/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/clerk-js-ui.mdc)

packages/clerk-js/src/ui/**/*.{ts,tsx}: Element descriptors should always be camelCase
Use element descriptors in UI components to enable consistent theming and styling via appearance.elements
Element descriptors should generate unique, stable CSS classes for theming
Element descriptors should handle state classes (e.g., cl-loading, cl-active, cl-error, cl-open) automatically based on component state
Do not render hard-coded values; all user-facing strings must be localized using provided localization methods
Use the useLocalizations hook and localizationKeys utility for all text and error messages
Use the styled system (sx prop, theme tokens, responsive values) for custom component styling
Use useCardState for card-level state, useFormState for form-level state, and useLoadingStatus for loading states
Always use handleError utility for API errors and use translateError for localized error messages
Use useFormControl for form field state, implement proper validation, and handle loading and error states in forms
Use localization keys for all form labels and placeholders
Use element descriptors for consistent styling and follow the theme token system
Use the Card and FormContainer patterns for consistent UI structure

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
**/*.{jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{jsx,tsx}: Use error boundaries in React components
Minimize re-renders in React components

**/*.{jsx,tsx}: Always use functional components with hooks instead of class components
Follow PascalCase naming for components: UserProfile, NavigationMenu
Keep components focused on a single responsibility - split large components
Limit component size to 150-200 lines; extract logic into custom hooks
Use composition over inheritance - prefer smaller, composable components
Export components as named exports for better tree-shaking
One component per file with matching filename and component name
Use useState for simple state management
Use useReducer for complex state logic
Implement proper state initialization
Use proper state updates with callbacks
Implement proper state cleanup
Use Context API for theme/authentication
Implement proper state selectors
Use proper state normalization
Implement proper state persistence
Use React.memo for expensive components
Implement proper useCallback for handlers
Use proper useMemo for expensive computations
Implement proper virtualization for lists
Use proper code splitting with React.lazy
Implement proper cleanup in useEffect
Use proper refs for DOM access
Implement proper event listener cleanup
Use proper abort controllers for fetch
Implement proper subscription cleanup
Use proper HTML elements
Implement proper ARIA attributes
Use proper heading hierarchy
Implement proper form labels
Use proper button types
Implement proper focus management
Use proper keyboard shortcuts
Implement proper tab order
Use proper skip links
Implement proper focus traps
Implement proper error boundaries
Use proper error logging
Implement proper error recovery
Use proper error messages
Implement proper error fallbacks
Use proper form validation
Implement proper error states
Use proper error messages
Implement proper form submission
Use proper form reset
Use proper component naming
Implement proper file naming
Use proper prop naming
Implement proper...

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
packages/**/*.{test,spec}.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Unit tests should use Jest or Vitest as the test runner.

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
packages/{clerk-js,elements,themes}/**/*.{test,spec}.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Visual regression testing should be performed for UI components.

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/react.mdc)

**/*.tsx: Use proper type definitions for props and state
Leverage TypeScript's type inference where possible
Use proper event types for handlers
Implement proper generic types for reusable components
Use proper type guards for conditional rendering

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
**/*.test.{jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/react.mdc)

**/*.test.{jsx,tsx}: Use React Testing Library
Test component behavior, not implementation
Use proper test queries
Implement proper test isolation
Use proper test coverage
Test component interactions
Use proper test data
Implement proper test setup
Use proper test cleanup
Implement proper test assertions
Use proper test structure

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
**/__tests__/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/typescript.mdc)

**/__tests__/**/*.{ts,tsx}: Create type-safe test builders/factories
Use branded types for test isolation
Implement proper mock types that match interfaces

Files:

  • packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
🧬 Code graph analysis (1)
packages/clerk-js/src/core/resources/BillingPaymentSource.ts (1)
packages/clerk-js/src/core/modules/billing/namespace.ts (1)
  • Billing (30-142)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (5)
  • GitHub Check: Build Packages
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
🔇 Additional comments (7)
.changeset/kind-ghosts-smile.md (1)

1-2: Empty changeset detected.

This changeset file contains no package declarations or description, making it a no-op. If this PR should trigger version bumps and changelog entries, please add the affected packages and a description between the --- separators. Otherwise, if this changeset was added only to satisfy CI checks, consider whether it's necessary.

As per coding guidelines: "Automated releases must use Changesets."

packages/clerk-js/src/core/resources/BillingPaymentSource.ts (2)

12-12: LGTM!

The import of the Billing module enables centralized endpoint path construction, improving code maintainability.


52-52: LGTM!

The refactoring to use Billing.path centralizes endpoint construction and maintains correct context (organization vs. user) based on the orgId parameter. This improves code maintainability and consistency across billing operations.

Also applies to: 63-63

packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx (2)

369-369: LGTM!

The test fixture correctly uses paymentMethod instead of paymentSource, aligning with the updated API shape from the useCheckout hook.


761-761: LGTM!

The planId updates to 'plan_with_payment_methods' correctly reflect the new naming convention and improve test clarity. The changes are consistent across all tests that validate payment method handling.

Also applies to: 900-900, 1039-1039

packages/types/src/json.ts (1)

699-699: Verify backend and external consumers use the new discriminator
No occurrences of commerce_payment_source_initialize remain in this repo. Confirm the backend now returns commerce_payment_method_initialize and any downstream clients handle the updated value.

packages/shared/src/react/hooks/useCheckout.ts (1)

114-114: Confirm safe rename: no checkout.paymentSource usages in code.
Search across .ts/.tsx files returned only localization keys and type-doc references, not any runtime accesses to checkout.paymentSource. Consumers have been updated to use paymentMethod.

path: Billing.path(`/payers/default_payment_method`, { orgId }),
method: 'PUT',
body: { payment_source_id: this.id } as any,
body: { payment_method_id: this.id } as any,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify backend API compatibility for the payload key change.

The request body key has been changed from payment_source_id to payment_method_id. Ensure the backend API has been updated to accept this new key name, as this is a breaking change.


🏁 Script executed:

#!/bin/bash
set -e

echo "Searching for old key 'payment_source_id'"
rg -n 'payment_source_id' -C2

echo "Searching for new key 'payment_method_id'"
rg -n 'payment_method_id' -C2

Length of output: 4084


Backend schema still expects payment_source_id Update packages/backend/src/api/resources/JSON.ts:990 to accept payment_method_id or revert the payload key rename.

🤖 Prompt for AI Agents
In packages/clerk-js/src/core/resources/BillingPaymentSource.ts around line 65,
the code sends body: { payment_method_id: this.id } but the backend schema still
expects payment_source_id; either change this client payload back to
payment_source_id or update packages/backend/src/api/resources/JSON.ts at ~line
990 to accept payment_method_id (or both for backward compatibility). Modify the
client to send payment_source_id (preferred) or update the backend
schema/validation to accept both keys and map payment_method_id to
payment_source_id so requests succeed without breaking existing consumers.

Copy link

pkg-pr-new bot commented Oct 10, 2025

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@6962

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@6962

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@6962

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@6962

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@6962

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@6962

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@6962

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@6962

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@6962

@clerk/express

npm i https://pkg.pr.new/@clerk/express@6962

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@6962

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@6962

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@6962

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@6962

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@6962

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@6962

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@6962

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@6962

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@6962

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@6962

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@6962

@clerk/types

npm i https://pkg.pr.new/@clerk/types@6962

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@6962

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@6962

commit: ebdd8e6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants