Skip to content

Commit f102f89

Browse files
committed
fix: rename-custom-to-sdk-metadata
1 parent a5ad4f8 commit f102f89

4 files changed

Lines changed: 19 additions & 20 deletions

File tree

flagsmith-engine/evaluation/evaluationContext/mappers.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import {
22
FeaturesWithMetadata,
3-
Segments,
43
Traits,
54
GenericEvaluationContext,
65
EnvironmentContext,
76
IdentityContext,
87
SegmentSource,
9-
CustomFeatureMetadata,
8+
SDKFeatureMetadata,
109
SegmentsWithMetadata,
11-
CustomSegmentMetadata
10+
SDKSegmentMetadata
1211
} from '../models.js';
1312
import { EnvironmentModel } from '../../environments/models.js';
1413
import { IdentityModel } from '../../identities/models.js';
@@ -47,7 +46,7 @@ function mapEnvironmentModelToEvaluationContext(
4746
name: environment.project.name
4847
};
4948

50-
const features: FeaturesWithMetadata<CustomFeatureMetadata> = {};
49+
const features: FeaturesWithMetadata<SDKFeatureMetadata> = {};
5150
for (const fs of environment.featureStates) {
5251
const variants =
5352
fs.multivariateFeatureStateValues?.length > 0
@@ -71,7 +70,7 @@ function mapEnvironmentModelToEvaluationContext(
7170
};
7271
}
7372

74-
const segmentOverrides: SegmentsWithMetadata<CustomSegmentMetadata> = {};
73+
const segmentOverrides: SegmentsWithMetadata<SDKSegmentMetadata> = {};
7574
for (const segment of environment.project.segments) {
7675
segmentOverrides[segment.id.toString()] = {
7776
key: segment.id.toString(),
@@ -97,7 +96,7 @@ function mapEnvironmentModelToEvaluationContext(
9796
};
9897
}
9998

100-
let identityOverrideSegments: SegmentsWithMetadata<CustomSegmentMetadata> = {};
99+
let identityOverrideSegments: SegmentsWithMetadata<SDKSegmentMetadata> = {};
101100
if (environment.identityOverrides && environment.identityOverrides.length > 0) {
102101
identityOverrideSegments = mapIdentityOverridesToSegments(environment.identityOverrides);
103102
}
@@ -149,8 +148,8 @@ function mapSegmentRuleModelToRule(rule: any): any {
149148

150149
function mapIdentityOverridesToSegments(
151150
identityOverrides: IdentityModel[]
152-
): SegmentsWithMetadata<CustomSegmentMetadata> {
153-
const segments: SegmentsWithMetadata<CustomSegmentMetadata> = {};
151+
): SegmentsWithMetadata<SDKSegmentMetadata> {
152+
const segments: SegmentsWithMetadata<SDKSegmentMetadata> = {};
154153
const featuresToIdentifiers = new Map<string, { identifiers: string[]; overrides: any[] }>();
155154

156155
for (const identity of identityOverrides) {

flagsmith-engine/evaluation/models.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export enum SegmentSource {
2424
}
2525

2626
// Feature types
27-
export interface CustomFeatureMetadata extends FeatureMetadata {
27+
export interface SDKFeatureMetadata extends FeatureMetadata {
2828
id: number;
2929
}
3030

@@ -48,7 +48,7 @@ export type EvaluationResultFlags<T extends FeatureMetadata = FeatureMetadata> =
4848
>;
4949

5050
// Segment types
51-
export interface CustomSegmentMetadata extends SegmentMetadata {
51+
export interface SDKSegmentMetadata extends SegmentMetadata {
5252
id?: number;
5353
source?: SegmentSource;
5454
}
@@ -65,7 +65,7 @@ export type SegmentsWithMetadata<T extends SegmentMetadata = SegmentMetadata> =
6565

6666
export interface SegmentResultWithMetadata {
6767
name: string;
68-
metadata: CustomSegmentMetadata;
68+
metadata: SDKSegmentMetadata;
6969
}
7070

7171
export type EvaluationResultSegments = SegmentResultWithMetadata[];
@@ -83,8 +83,8 @@ export interface GenericEvaluationContext<
8383
}
8484

8585
export type EvaluationContextWithMetadata = GenericEvaluationContext<
86-
CustomFeatureMetadata,
87-
CustomSegmentMetadata
86+
SDKFeatureMetadata,
87+
SDKSegmentMetadata
8888
>;
8989

9090
// Evaluation result types
@@ -93,4 +93,4 @@ export type EvaluationResult<T extends FeatureMetadata = FeatureMetadata> = {
9393
segments: EvaluationResultSegments;
9494
};
9595

96-
export type EvaluationResultWithMetadata = EvaluationResult<CustomFeatureMetadata>;
96+
export type EvaluationResultWithMetadata = EvaluationResult<SDKFeatureMetadata>;

flagsmith-engine/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
EvaluationResultSegments,
44
EvaluationResultWithMetadata,
55
FeatureContextWithMetadata,
6-
CustomFeatureMetadata,
6+
SDKFeatureMetadata,
77
FlagResultWithMetadata
88
} from './evaluation/models.js';
99
import { getIdentitySegments, getIdentityKey } from './segments/evaluators.js';
@@ -18,7 +18,7 @@ export { FeatureModel, FeatureStateModel } from './features/models.js';
1818
export { OrganisationModel } from './organisations/models.js';
1919

2020
type SegmentOverride = {
21-
feature: FeatureContextWithMetadata<CustomFeatureMetadata>;
21+
feature: FeatureContextWithMetadata<SDKFeatureMetadata>;
2222
segmentName: string;
2323
};
2424

@@ -121,8 +121,8 @@ export function processSegmentOverrides(identitySegments: any[]): Record<string,
121121
export function evaluateFeatures(
122122
context: EvaluationContextWithMetadata,
123123
segmentOverrides: Record<string, SegmentOverride>
124-
): EvaluationResultFlags<CustomFeatureMetadata> {
125-
const flags: EvaluationResultFlags<CustomFeatureMetadata> = {};
124+
): EvaluationResultFlags<SDKFeatureMetadata> {
125+
const flags: EvaluationResultFlags<SDKFeatureMetadata> = {};
126126

127127
for (const feature of Object.values(context.features || {})) {
128128
const segmentOverride = segmentOverrides[feature.name];
@@ -141,7 +141,7 @@ export function evaluateFeatures(
141141
reason:
142142
evaluatedReason ??
143143
getTargetingMatchReason({ type: 'SEGMENT', override: segmentOverride })
144-
} as FlagResultWithMetadata<CustomFeatureMetadata>;
144+
} as FlagResultWithMetadata<SDKFeatureMetadata>;
145145
}
146146

147147
return flags;

sdk/models.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
CustomFeatureMetadata,
2+
SDKFeatureMetadata,
33
FlagResultWithMetadata,
44
EvaluationResultWithMetadata
55
} from '../flagsmith-engine/evaluation/models.js';

0 commit comments

Comments
 (0)