Skip to content

Commit 72309fe

Browse files
committed
fix(eslint): inspect static provider expressions
1 parent fe0d279 commit 72309fe

6 files changed

Lines changed: 91 additions & 8 deletions

File tree

‎packages/config-eslint/provider-identifiers.js‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,20 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
8080
return undefined
8181
}
8282

83+
function getProviderExpressionBranches(node) {
84+
node = unwrapExpression(node)
85+
86+
if (node?.type === "LogicalExpression") {
87+
return [node.left, node.right]
88+
}
89+
90+
if (node?.type === "ConditionalExpression") {
91+
return [node.consequent, node.alternate]
92+
}
93+
94+
return []
95+
}
96+
8397
function getProviderMapDeclarator(objectExpression) {
8498
let expression = objectExpression
8599
while (typescriptExpressionWrappers.has(expression.parent?.type)) {
@@ -101,14 +115,18 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
101115
},
102116
create(context) {
103117
function reportIfRawProvider(node) {
118+
for (const branch of getProviderExpressionBranches(node)) {
119+
reportIfRawProvider(branch)
120+
}
121+
104122
const provider = getRawProvider(node)
105123
if (provider) {
106124
context.report({ node, messageId: useCanonicalMessageId, data: provider })
107125
}
108126
}
109127

110128
function reportIfRawProviderMapKey(node) {
111-
if (node.computed || node.parent?.type !== "ObjectExpression") {
129+
if (node.parent?.type !== "ObjectExpression") {
112130
return
113131
}
114132

@@ -117,7 +135,12 @@ export function createProviderIdentifierConfig({ providerIdentifiers, retiredPro
117135
return
118136
}
119137

120-
const value = getStaticName(node.key)
138+
const rawProvider = getRawProvider(node.key)
139+
if (node.computed && !rawProvider) {
140+
return
141+
}
142+
143+
const value = rawProvider?.value ?? getStaticName(node.key)
121144
const replacement = value ? providerReplacementsByValue.get(value) : undefined
122145
if (replacement) {
123146
context.report({

‎packages/config-eslint/provider-identifiers.test.js‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const ruleTester = new RuleTester({
3030
ruleTester.run("no-raw-provider-identifiers provider map keys", rule, {
3131
valid: [
3232
"const dynamicProviderExtras = { [providerIdentifiers.openrouter]: {} }",
33+
"const dynamicProviderExtras = { [providerName]: {} }",
3334
"const response = { openrouter: externalPayload }",
3435
'const providerIdentifiers = { openrouter: "openrouter", vercelAiGateway: "vercel-ai-gateway" }',
3536
],
@@ -47,6 +48,21 @@ ruleTester.run("no-raw-provider-identifiers provider map keys", rule, {
4748
},
4849
],
4950
},
51+
{
52+
code: 'const dynamicProviderExtras = { ["openrouter"]: {}, [`vercel-ai-gateway`]: {} }',
53+
errors: [
54+
{
55+
messageId: "useCanonical",
56+
data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
57+
type: "Literal",
58+
},
59+
{
60+
messageId: "useCanonical",
61+
data: { replacement: "providerIdentifiers.vercelAiGateway", value: "vercel-ai-gateway" },
62+
type: "TemplateLiteral",
63+
},
64+
],
65+
},
5066
],
5167
})
5268

@@ -57,6 +73,8 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
5773
'const config = { apiProvider: "external-provider" }',
5874
"const config = { apiProvider: providerIdentifiers.poe }",
5975
"const provider = providerIdentifiers.openrouter",
76+
"const provider = configuredProvider || providerIdentifiers.openrouter",
77+
"const apiProvider = useGemini ? providerIdentifiers.gemini : providerIdentifiers.openrouter",
6078
"getProviderServiceConfig(providerIdentifiers.gemini)",
6179
'if (config?.protocol === "gemini") {}',
6280
'const response = { protocol: "anthropic", format: "openrouter" }',
@@ -152,5 +170,45 @@ ruleTester.run("no-raw-provider-identifiers provider-like values", rule, {
152170
},
153171
],
154172
},
173+
{
174+
code: 'const config = { apiProvider: configuredProvider || "openrouter" }',
175+
errors: [
176+
{
177+
messageId: "useCanonical",
178+
data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
179+
type: "Literal",
180+
},
181+
],
182+
},
183+
{
184+
code: 'const imageProvider = useGemini ? "gemini" : "openrouter"',
185+
errors: [
186+
{
187+
messageId: "useCanonical",
188+
data: { replacement: "providerIdentifiers.gemini", value: "gemini" },
189+
type: "Literal",
190+
},
191+
{
192+
messageId: "useCanonical",
193+
data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
194+
type: "Literal",
195+
},
196+
],
197+
},
198+
{
199+
code: 'const apiProvider = (useGemini ? "gemini" : configuredProvider) || "openrouter"',
200+
errors: [
201+
{
202+
messageId: "useCanonical",
203+
data: { replacement: "providerIdentifiers.gemini", value: "gemini" },
204+
type: "Literal",
205+
},
206+
{
207+
messageId: "useCanonical",
208+
data: { replacement: "providerIdentifiers.openrouter", value: "openrouter" },
209+
type: "Literal",
210+
},
211+
],
212+
},
155213
],
156214
})

‎src/core/webview/ClineProvider.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,7 +2810,8 @@ export class ClineProvider
28102810
codebaseIndexConfig: {
28112811
codebaseIndexEnabled: codebaseIndexConfig?.codebaseIndexEnabled ?? false,
28122812
codebaseIndexQdrantUrl: codebaseIndexConfig?.codebaseIndexQdrantUrl ?? "http://localhost:6333",
2813-
codebaseIndexEmbedderProvider: codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? "openai",
2813+
codebaseIndexEmbedderProvider:
2814+
codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? providerIdentifiers.openai,
28142815
codebaseIndexEmbedderBaseUrl: codebaseIndexConfig?.codebaseIndexEmbedderBaseUrl ?? "",
28152816
codebaseIndexEmbedderModelId: codebaseIndexConfig?.codebaseIndexEmbedderModelId ?? "",
28162817
codebaseIndexEmbedderModelDimension: codebaseIndexConfig?.codebaseIndexEmbedderModelDimension ?? 1536,
@@ -2893,7 +2894,7 @@ export class ClineProvider
28932894
const apiProvider: ProviderName =
28942895
stateValues.apiProvider && !isRetiredProvider(stateValues.apiProvider)
28952896
? stateValues.apiProvider
2896-
: "anthropic"
2897+
: providerIdentifiers.anthropic
28972898

28982899
// Build the apiConfiguration object combining state values and secrets.
28992900
const providerSettings = this.contextProxy.getProviderSettings()
@@ -3038,7 +3039,7 @@ export class ClineProvider
30383039
codebaseIndexQdrantUrl:
30393040
stateValues.codebaseIndexConfig?.codebaseIndexQdrantUrl ?? "http://localhost:6333",
30403041
codebaseIndexEmbedderProvider:
3041-
stateValues.codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? "openai",
3042+
stateValues.codebaseIndexConfig?.codebaseIndexEmbedderProvider ?? providerIdentifiers.openai,
30423043
codebaseIndexEmbedderBaseUrl: stateValues.codebaseIndexConfig?.codebaseIndexEmbedderBaseUrl ?? "",
30433044
codebaseIndexEmbedderModelId: stateValues.codebaseIndexConfig?.codebaseIndexEmbedderModelId ?? "",
30443045
codebaseIndexEmbedderModelDimension:

‎src/services/code-index/config-manager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export class CodeIndexConfigManager {
306306
// Handle null/undefined values safely
307307
const prevEnabled = prev?.enabled ?? false
308308
const prevConfigured = prev?.configured ?? false
309-
const prevProvider = prev?.embedderProvider ?? "openai"
309+
const prevProvider = prev?.embedderProvider ?? providerIdentifiers.openai
310310
const prevOpenAiKey = prev?.openAiKey ?? ""
311311
const prevOllamaBaseUrl = prev?.ollamaBaseUrl ?? ""
312312
const prevOpenAiCompatibleBaseUrl = prev?.openAiCompatibleBaseUrl ?? ""

‎webview-ui/src/components/chat/CodeIndexPopover.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
261261
const settings = {
262262
codebaseIndexEnabled: codebaseIndexConfig.codebaseIndexEnabled ?? true,
263263
codebaseIndexQdrantUrl: codebaseIndexConfig.codebaseIndexQdrantUrl || "",
264-
codebaseIndexEmbedderProvider: codebaseIndexConfig.codebaseIndexEmbedderProvider || "openai",
264+
codebaseIndexEmbedderProvider:
265+
codebaseIndexConfig.codebaseIndexEmbedderProvider || providerIdentifiers.openai,
265266
codebaseIndexEmbedderBaseUrl: codebaseIndexConfig.codebaseIndexEmbedderBaseUrl || "",
266267
codebaseIndexEmbedderModelId: codebaseIndexConfig.codebaseIndexEmbedderModelId || "",
267268
codebaseIndexEmbedderModelDimension:

‎webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ vi.mock("@/components/ui/hooks/useSelectedModel", () => ({
5353
}
5454
return {
5555
id: apiConfiguration?.apiModelId || "claude-3-5-sonnet-20241022",
56-
provider: apiConfiguration?.apiProvider || "anthropic",
56+
provider: apiConfiguration?.apiProvider || providerIdentifiers.anthropic,
5757
info: undefined,
5858
}
5959
},

0 commit comments

Comments
 (0)