feat: reverted-types-to-main-and-bumped-version

Author: Zaimwa9

flagsmith-engine/evaluation/models.ts

@@ -12,7 +12,7 @@ import type {
     FeatureContext,
     EnvironmentContext,
     IdentityContext,
-    SegmentContext
+    Segments
 } from './evaluationContext/evaluationContext.types.js';
 
 export interface CustomFeatureMetadata extends FeatureMetadata {
@@ -31,8 +31,8 @@ export type FeaturesWithMetadata<T extends FeatureMetadata = FeatureMetadata> =
 
 export interface GenericEvaluationContext<T extends FeatureMetadata = FeatureMetadata> {
     environment: EnvironmentContext;
-    identity?: IdentityContext;
-    segments?: SegmentContext;
+    identity?: IdentityContext | null;
+    segments?: Segments;
     features?: FeaturesWithMetadata<T>;
     [k: string]: unknown;
 }
@@ -53,8 +53,8 @@ export type EvaluationResult<T extends FeatureMetadata = FeatureMetadata> = {
     segments: EvaluationResultSegments;
 };
 
-export type EvaluationResultWithMetadata = EvaluationResult<FeatureMetadata>;
-export type EvaluationContextWithMetadata = GenericEvaluationContext<FeatureMetadata>;
+export type EvaluationResultWithMetadata = EvaluationResult<CustomFeatureMetadata>;
+export type EvaluationContextWithMetadata = GenericEvaluationContext<CustomFeatureMetadata>;
 
 export enum SegmentSource {
     API = 'api',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "6.1.0",
+  "version": "7.0.0",
   "description": "Flagsmith lets you manage features flags and remote config across web, mobile and server side applications. Deliver true Continuous Integration. Get builds out faster. Control who has access to new features.",
   "main": "./build/cjs/index.js",
   "type": "module",
@@ -58,8 +58,8 @@
     "deploy": "npm i && npm run build && npm publish",
     "deploy:beta": "npm i && npm run build && npm publish --tag beta",
     "prepare": "husky install",
-    "generate-evaluation-result-types": "curl -o evaluation-result.json https://raw.githubusercontent.com/Flagsmith/flagsmith/chore%2Fschema-niceties/sdk/evaluation-result.json && npx json2ts -i evaluation-result.json -o flagsmith-engine/evaluation/evaluationResult/evaluationResult.types.ts && rm evaluation-result.json",
-    "generate-evaluation-context-types": "curl -o evaluation-context.json https://raw.githubusercontent.com/Flagsmith/flagsmith/chore%2Fschema-niceties/sdk/evaluation-context.json && npx json2ts -i evaluation-context.json -o flagsmith-engine/evaluation/evaluationContext/evaluationContext.types.ts && rm evaluation-context.json",
+    "generate-evaluation-result-types": "curl -o evaluation-result.json https://raw.githubusercontent.com/Flagsmith/flagsmith/main/sdk/evaluation-result.json && npx json2ts -i evaluation-result.json -o flagsmith-engine/evaluation/evaluationResult/evaluationResult.types.ts && rm evaluation-result.json",
+    "generate-evaluation-context-types": "curl -o evaluation-context.json https://raw.githubusercontent.com/Flagsmith/flagsmith/main/sdk/evaluation-context.json && npx json2ts -i evaluation-context.json -o flagsmith-engine/evaluation/evaluationContext/evaluationContext.types.ts && rm evaluation-context.json",
     "generate-engine-types": "npm run generate-evaluation-result-types && npm run generate-evaluation-context-types"
   },
   "dependencies": {

sdk/models.ts

@@ -1,7 +1,7 @@
 import {
-    EvaluationResult,
     CustomFeatureMetadata,
-    FlagResultWithMetadata
+    FlagResultWithMetadata,
+    EvaluationResultWithMetadata
 } from '../flagsmith-engine/evaluation/models.js';
 import { FeatureStateModel } from '../flagsmith-engine/features/models.js';
 import { AnalyticsProcessor } from './analytics.js';
@@ -85,7 +85,7 @@ export class Flag extends BaseFlag {
         });
     }
 
-    static fromFlagResult(flagResult: FlagResultWithMetadata<CustomFeatureMetadata>): Flag {
+    static fromFlagResult(flagResult: FlagResultWithMetadata<CustomFeatureMetadata>): Flag | null {
         return new Flag({
             enabled: flagResult.enabled,
             value: flagResult.value ?? null,
@@ -122,16 +122,21 @@ export class Flags {
     }
 
     static fromEvaluationResult(
-        evaluationResult: EvaluationResult,
+        evaluationResult: EvaluationResultWithMetadata,
         defaultFlagHandler?: (v: string) => DefaultFlag,
         analyticsProcessor?: AnalyticsProcessor
     ): Flags {
         const flags: { [key: string]: Flag } = {};
         for (const flag of Object.values(evaluationResult.flags)) {
+            const flagsmithId = flag.metadata?.flagsmithId || Number(flag.feature_key);
+            if (!flagsmithId) {
+                continue;
+            }
+
             flags[flag.name] = new Flag({
                 enabled: flag.enabled,
                 value: flag.value ?? null,
-                featureId: Number(flag.feature_key),
+                featureId: flag.metadata?.flagsmithId || Number(flag.feature_key),
                 featureName: flag.name,
                 reason: flag.reason
             });