Skip to content

Commit cdc46b0

Browse files
jonathannorrisjonathannorris
committed
fix: update @typescript-eslint/no-unused-vars eslint rules, cleanup code. rename WebMultiProvider to MultiProvider
1 parent 8a3ce44 commit cdc46b0

File tree

7 files changed

+52
-49
lines changed

7 files changed

+52
-49
lines changed

‎.eslintrc.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
},
1313
"plugins": ["@typescript-eslint", "check-file", "jsdoc"],
1414
"rules": {
15+
"@typescript-eslint/no-unused-vars": [
16+
"error",
17+
{
18+
"argsIgnorePattern": "^_",
19+
"varsIgnorePattern": "^_",
20+
"caughtErrorsIgnorePattern": "^_",
21+
"ignoreRestSiblings": true
22+
}
23+
],
1524
"@typescript-eslint/consistent-type-imports": [
1625
"error",
1726
{

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/server/src/provider/multi-provider/strategies/base-evaluation-strategy.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-unused-vars */
21
import type {
32
ErrorCode,
43
EvaluationContext,
@@ -57,7 +56,6 @@ export type FinalResult<T extends FlagValue> = {
5756
export abstract class BaseEvaluationStrategy {
5857
public runMode: 'parallel' | 'sequential' = 'sequential';
5958

60-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6159
shouldEvaluateThisProvider(strategyContext: StrategyPerProviderContext, _evalContext?: EvaluationContext): boolean {
6260
if (
6361
strategyContext.providerStatus === ProviderStatus.NOT_READY ||

‎packages/web/src/provider/multi-provider/multi-provider-web.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { FirstMatchStrategy } from './strategies';
2525
import { StatusTracker } from './status-tracker';
2626
import type { ProviderEntryInput, RegisteredProvider } from './types';
2727

28-
export class WebMultiProvider implements Provider {
28+
export class MultiProvider implements Provider {
2929
readonly runsOn = 'client';
3030

3131
public readonly events = new OpenFeatureEventEmitter();
@@ -56,7 +56,7 @@ export class WebMultiProvider implements Provider {
5656

5757
this.metadata = {
5858
...aggregateMetadata,
59-
name: WebMultiProvider.name,
59+
name: MultiProvider.name,
6060
};
6161
}
6262

‎packages/web/src/provider/multi-provider/strategies/base-evaluation-strategy.ts‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-unused-vars */
21
import type {
32
ErrorCode,
43
EvaluationContext,
@@ -55,8 +54,7 @@ export type FinalResult<T extends FlagValue> = {
5554
* Contains default implementations for `shouldEvaluateThisProvider` and `shouldEvaluateNextProvider`
5655
*/
5756
export abstract class BaseEvaluationStrategy {
58-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
59-
shouldEvaluateThisProvider(strategyContext: StrategyPerProviderContext, evalContext: EvaluationContext): boolean {
57+
shouldEvaluateThisProvider(strategyContext: StrategyPerProviderContext, _evalContext: EvaluationContext): boolean {
6058
if (
6159
strategyContext.providerStatus === ProviderStatus.NOT_READY ||
6260
strategyContext.providerStatus === ProviderStatus.FATAL
@@ -67,18 +65,18 @@ export abstract class BaseEvaluationStrategy {
6765
}
6866

6967
shouldEvaluateNextProvider<T extends FlagValue>(
70-
strategyContext: StrategyPerProviderContext,
71-
context: EvaluationContext,
72-
result: ProviderResolutionResult<T>,
68+
_strategyContext: StrategyPerProviderContext,
69+
_context: EvaluationContext,
70+
_result: ProviderResolutionResult<T>,
7371
): boolean {
7472
return true;
7573
}
7674

7775
shouldTrackWithThisProvider(
7876
strategyContext: StrategyProviderContext,
79-
context: EvaluationContext,
80-
trackingEventName: string,
81-
trackingEventDetails: TrackingEventDetails,
77+
_context: EvaluationContext,
78+
_trackingEventName: string,
79+
_trackingEventDetails: TrackingEventDetails,
8280
): boolean {
8381
if (
8482
strategyContext.providerStatus === ProviderStatus.NOT_READY ||

‎packages/web/test/evaluation-context.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ class MockProvider implements Provider {
1212

1313
initialize = initializeMock;
1414

15-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
16-
onContextChange(oldContext: EvaluationContext, newContext: EvaluationContext): Promise<void> {
15+
onContextChange(_oldContext: EvaluationContext, _newContext: EvaluationContext): Promise<void> {
1716
return Promise.resolve();
1817
}
1918

20-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
21-
resolveBooleanEvaluation = jest.fn((flagKey: string, defaultValue: boolean, context: EvaluationContext) => {
19+
resolveBooleanEvaluation = jest.fn((_flagKey: string, _defaultValue: boolean, _context: EvaluationContext) => {
2220
return {
2321
value: true,
2422
};

‎packages/web/test/multi-provider-web.spec.ts‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
2-
import { WebMultiProvider } from '../src/provider/multi-provider/multi-provider-web';
2+
import { MultiProvider } from '../src/provider/multi-provider/multi-provider-web';
33
import type {
44
EvaluationContext,
55
FlagValue,
@@ -44,13 +44,13 @@ class TestProvider implements Provider {
4444
}
4545
}
4646

47-
const callEvaluation = (multi: WebMultiProvider, context: EvaluationContext) => {
47+
const callEvaluation = (multi: MultiProvider, context: EvaluationContext) => {
4848
callBeforeHook(multi, context, 'flag', 'boolean', false);
4949
return multi.resolveBooleanEvaluation('flag', false, context);
5050
};
5151

5252
const callBeforeHook = (
53-
multi: WebMultiProvider,
53+
multi: MultiProvider,
5454
context: EvaluationContext,
5555
flagKey: string,
5656
flagType: FlagValueType,
@@ -75,7 +75,7 @@ describe('MultiProvider', () => {
7575

7676
describe('unique names', () => {
7777
it('uses provider names for unique types', () => {
78-
const multiProvider = new WebMultiProvider([
78+
const multiProvider = new MultiProvider([
7979
{
8080
provider: new InMemoryProvider(),
8181
},
@@ -88,7 +88,7 @@ describe('MultiProvider', () => {
8888
expect(multiProvider.providerEntries.length).toBe(2);
8989
});
9090
it('generates unique names for identical provider types', () => {
91-
const multiProvider = new WebMultiProvider([
91+
const multiProvider = new MultiProvider([
9292
{
9393
provider: new TestProvider(),
9494
},
@@ -109,7 +109,7 @@ describe('MultiProvider', () => {
109109
expect(multiProvider.providerEntries.length).toBe(4);
110110
});
111111
it('uses specified names for identical provider types', () => {
112-
const multiProvider = new WebMultiProvider([
112+
const multiProvider = new MultiProvider([
113113
{
114114
provider: new TestProvider(),
115115
name: 'provider1',
@@ -126,7 +126,7 @@ describe('MultiProvider', () => {
126126
it('throws an error if specified names are not unique', () => {
127127
expect(
128128
() =>
129-
new WebMultiProvider([
129+
new MultiProvider([
130130
{
131131
provider: new TestProvider(),
132132
name: 'provider',
@@ -145,7 +145,7 @@ describe('MultiProvider', () => {
145145
const provider1 = new TestProvider();
146146
const provider2 = new TestProvider();
147147
let initializations = 0;
148-
const multiProvider = new WebMultiProvider([
148+
const multiProvider = new MultiProvider([
149149
{
150150
provider: provider1,
151151
},
@@ -166,7 +166,7 @@ describe('MultiProvider', () => {
166166
const provider1 = new TestProvider();
167167
const provider2 = new TestProvider();
168168
let initializations = 0;
169-
const multiProvider = new WebMultiProvider([
169+
const multiProvider = new MultiProvider([
170170
{
171171
provider: provider1,
172172
},
@@ -185,7 +185,7 @@ describe('MultiProvider', () => {
185185
it('emits events when aggregate status changes', async () => {
186186
const provider1 = new TestProvider();
187187
const provider2 = new TestProvider();
188-
const multiProvider = new WebMultiProvider([
188+
const multiProvider = new MultiProvider([
189189
{
190190
provider: provider1,
191191
},
@@ -237,7 +237,7 @@ describe('MultiProvider', () => {
237237
const provider1 = new TestProvider();
238238
const provider2 = new TestProvider();
239239

240-
const multiProvider = new WebMultiProvider([
240+
const multiProvider = new MultiProvider([
241241
{
242242
provider: provider1,
243243
},
@@ -304,7 +304,7 @@ describe('MultiProvider', () => {
304304
},
305305
];
306306

307-
const multiProvider = new WebMultiProvider(
307+
const multiProvider = new MultiProvider(
308308
[
309309
{
310310
provider: provider1,
@@ -369,7 +369,7 @@ describe('MultiProvider', () => {
369369
},
370370
];
371371

372-
const multiProvider = new WebMultiProvider([
372+
const multiProvider = new MultiProvider([
373373
{
374374
provider: provider1,
375375
},
@@ -392,7 +392,7 @@ describe('MultiProvider', () => {
392392
const provider1 = new TestProvider();
393393
provider1.resolveStringEvaluation.mockReturnValue({ value: 'value' });
394394

395-
const multiProvider = new WebMultiProvider([
395+
const multiProvider = new MultiProvider([
396396
{
397397
provider: provider1,
398398
},
@@ -410,7 +410,7 @@ describe('MultiProvider', () => {
410410
const provider1 = new TestProvider();
411411
provider1.resolveNumberEvaluation.mockReturnValue({ value: 1 });
412412

413-
const multiProvider = new WebMultiProvider([
413+
const multiProvider = new MultiProvider([
414414
{
415415
provider: provider1,
416416
},
@@ -430,7 +430,7 @@ describe('MultiProvider', () => {
430430
const provider1 = new TestProvider();
431431
provider1.resolveBooleanEvaluation.mockReturnValue({ value: true });
432432

433-
const multiProvider = new WebMultiProvider([
433+
const multiProvider = new MultiProvider([
434434
{
435435
provider: provider1,
436436
},
@@ -448,7 +448,7 @@ describe('MultiProvider', () => {
448448
const provider1 = new TestProvider();
449449
provider1.resolveObjectEvaluation.mockReturnValue({ value: { test: true } });
450450

451-
const multiProvider = new WebMultiProvider([
451+
const multiProvider = new MultiProvider([
452452
{
453453
provider: provider1,
454454
},
@@ -469,7 +469,7 @@ describe('MultiProvider', () => {
469469
provider1.resolveBooleanEvaluation.mockImplementation(() => {
470470
throw new Error('test error');
471471
});
472-
const multiProvider = new WebMultiProvider(
472+
const multiProvider = new MultiProvider(
473473
[
474474
{
475475
provider: provider1,
@@ -492,7 +492,7 @@ describe('MultiProvider', () => {
492492
errorCode: 'test-error',
493493
errorMessage: 'test error',
494494
});
495-
const multiProvider = new WebMultiProvider(
495+
const multiProvider = new MultiProvider(
496496
[
497497
{
498498
provider: provider1,
@@ -519,7 +519,7 @@ describe('MultiProvider', () => {
519519
provider2.resolveBooleanEvaluation.mockReturnValue({
520520
value: true,
521521
});
522-
const multiProvider = new WebMultiProvider(
522+
const multiProvider = new MultiProvider(
523523
[
524524
{
525525
provider: provider1,
@@ -549,7 +549,7 @@ describe('MultiProvider', () => {
549549
provider2.resolveBooleanEvaluation.mockReturnValue({
550550
value: true,
551551
});
552-
const multiProvider = new WebMultiProvider(
552+
const multiProvider = new MultiProvider(
553553
[
554554
{
555555
provider: provider1,
@@ -582,7 +582,7 @@ describe('MultiProvider', () => {
582582
provider2.resolveBooleanEvaluation.mockReturnValue({
583583
value: true,
584584
});
585-
const multiProvider = new WebMultiProvider(
585+
const multiProvider = new MultiProvider(
586586
[
587587
{
588588
provider: provider1,
@@ -613,7 +613,7 @@ describe('MultiProvider', () => {
613613
provider2.resolveBooleanEvaluation.mockReturnValue({ value: true });
614614
provider3.resolveBooleanEvaluation.mockReturnValue({ value: true });
615615

616-
const multiProvider = new WebMultiProvider(
616+
const multiProvider = new MultiProvider(
617617
[
618618
{
619619
provider: provider1,
@@ -651,7 +651,7 @@ describe('MultiProvider', () => {
651651

652652
const onMismatch = jest.fn();
653653

654-
const multiProvider = new WebMultiProvider(
654+
const multiProvider = new MultiProvider(
655655
[
656656
{
657657
provider: provider1,
@@ -704,7 +704,7 @@ describe('MultiProvider', () => {
704704
value: false,
705705
});
706706

707-
const multiProvider = new WebMultiProvider(
707+
const multiProvider = new MultiProvider(
708708
[
709709
{
710710
provider: provider1,
@@ -735,7 +735,7 @@ describe('MultiProvider', () => {
735735
const provider2 = new TestProvider();
736736
const provider3 = new TestProvider();
737737

738-
const multiProvider = new WebMultiProvider([
738+
const multiProvider = new MultiProvider([
739739
{ provider: provider1 },
740740
{ provider: provider2 },
741741
{ provider: provider3 },
@@ -753,7 +753,7 @@ describe('MultiProvider', () => {
753753
const provider2 = new InMemoryProvider(); // Doesn't have track method
754754
const provider3 = new TestProvider();
755755

756-
const multiProvider = new WebMultiProvider([
756+
const multiProvider = new MultiProvider([
757757
{ provider: provider1 },
758758
{ provider: provider2 },
759759
{ provider: provider3 },
@@ -774,7 +774,7 @@ describe('MultiProvider', () => {
774774
});
775775

776776
const mockLogger = { error: jest.fn(), warn: jest.fn(), info: jest.fn(), debug: jest.fn() };
777-
const multiProvider = new WebMultiProvider(
777+
const multiProvider = new MultiProvider(
778778
[{ provider: provider1 }, { provider: provider2 }, { provider: provider3 }],
779779
undefined,
780780
mockLogger,
@@ -805,7 +805,7 @@ describe('MultiProvider', () => {
805805

806806
const mockStrategy = new MockStrategy();
807807

808-
const multiProvider = new WebMultiProvider(
808+
const multiProvider = new MultiProvider(
809809
[{ provider: provider1 }, { provider: provider2 }, { provider: provider3 }],
810810
mockStrategy,
811811
);
@@ -823,7 +823,7 @@ describe('MultiProvider', () => {
823823
const provider2 = new TestProvider();
824824
const provider3 = new TestProvider();
825825

826-
const multiProvider = new WebMultiProvider([
826+
const multiProvider = new MultiProvider([
827827
{ provider: provider1 },
828828
{ provider: provider2 },
829829
{ provider: provider3 },
@@ -857,7 +857,7 @@ describe('MultiProvider', () => {
857857

858858
const mockStrategy = new MockStrategy();
859859

860-
const multiProvider = new WebMultiProvider([{ provider: provider1 }, { provider: provider2 }], mockStrategy);
860+
const multiProvider = new MultiProvider([{ provider: provider1 }, { provider: provider2 }], mockStrategy);
861861

862862
// Mock the status tracker to return READY status
863863
const mockStatusTracker = {

0 commit comments

Comments
 (0)