feat: re-added-fallback

Author: Zaimwa9

flagsmith-engine/evaluation/models.ts

@@ -21,7 +21,7 @@ export interface CustomFeatureMetadata extends FeatureMetadata {
 
 export interface FeatureContextWithMetadata<T extends FeatureMetadata = FeatureMetadata>
     extends FeatureContext {
-    metadata?: T;
+    metadata: T;
     [k: string]: unknown;
 }
 
@@ -38,7 +38,7 @@ export interface GenericEvaluationContext<T extends FeatureMetadata = FeatureMet
 }
 
 export type FlagResultWithMetadata<T extends FeatureMetadata = FeatureMetadata> = FlagResult & {
-    metadata?: T;
+    metadata: T;
 };
 
 export type EvaluationResultFlags<T extends FeatureMetadata = FeatureMetadata> = Record<

flagsmith-engine/index.ts

@@ -3,7 +3,8 @@ import {
     EvaluationResultSegments,
     EvaluationResultWithMetadata,
     FeatureContextWithMetadata,
-    CustomFeatureMetadata
+    CustomFeatureMetadata,
+    FlagResultWithMetadata
 } from './evaluation/models.js';
 import { getIdentitySegments } from './segments/evaluators.js';
 import { EvaluationResultFlags } from './evaluation/models.js';
@@ -142,7 +143,7 @@ export function evaluateFeatures(
             reason:
                 evaluatedReason ??
                 getTargetingMatchReason({ type: 'SEGMENT', override: segmentOverride })
-        };
+        } as FlagResultWithMetadata<CustomFeatureMetadata>;
     }
 
     return flags;

sdk/models.ts

@@ -85,16 +85,6 @@ export class Flag extends BaseFlag {
         });
     }
 
-    static fromFlagResult(flagResult: FlagResultWithMetadata<CustomFeatureMetadata>): Flag | null {
-        return new Flag({
-            enabled: flagResult.enabled,
-            value: flagResult.value ?? null,
-            featureId: flagResult.metadata?.flagsmithId ?? Number(flagResult.feature_key),
-            featureName: flagResult.name,
-            reason: flagResult.reason
-        });
-    }
-
     static fromAPIFlag(flagData: any): Flag {
         return new Flag({
             enabled: flagData['enabled'],
@@ -136,7 +126,7 @@ export class Flags {
             flags[flag.name] = new Flag({
                 enabled: flag.enabled,
                 value: flag.value ?? null,
-                featureId: flag.metadata?.flagsmithId || Number(flag.feature_key),
+                featureId: flagsmithId,
                 featureName: flag.name,
                 reason: flag.reason
             });