update

Author: linglingye001

src/featureManager.ts

@@ -6,7 +6,6 @@ import { IFeatureFilter } from "./filter/FeatureFilter.js";
 import { RequirementType } from "./schema/model.js";
 import { IFeatureFlagProvider } from "./featureProvider.js";
 import { TargetingFilter } from "./filter/TargetingFilter.js";
-import { validateFeatureFlag } from "./schema/validator.js";
 
 export class FeatureManager {
     #provider: IFeatureFlagProvider;
@@ -75,7 +74,6 @@ export class FeatureManager {
 
     async #getFeatureFlag(featureName: string): Promise<any> {
         const featureFlag = await this.#provider.getFeatureFlag(featureName);
-        validateFeatureFlag(featureFlag);
         return featureFlag;
     }
 

src/featureProvider.ts

@@ -3,6 +3,7 @@
 
 import { IGettable } from "./gettable.js";
 import { FeatureFlag, FeatureManagementConfiguration, FEATURE_MANAGEMENT_KEY, FEATURE_FLAGS_KEY } from "./schema/model.js";
+import { validateFeatureFlag } from "./schema/validator.js";
 
 export interface IFeatureFlagProvider {
     /**
@@ -28,12 +29,16 @@ export class ConfigurationMapFeatureFlagProvider implements IFeatureFlagProvider
     }
     async getFeatureFlag(featureName: string): Promise<FeatureFlag | undefined> {
         const featureConfig = this.#configuration.get<FeatureManagementConfiguration>(FEATURE_MANAGEMENT_KEY);
-        return featureConfig?.[FEATURE_FLAGS_KEY]?.findLast((feature) => feature.id === featureName);
+        const featureFlag = featureConfig?.[FEATURE_FLAGS_KEY]?.findLast((feature) => feature.id === featureName);
+        validateFeatureFlag(featureFlag);
+        return featureFlag;
     }
 
     async getFeatureFlags(): Promise<FeatureFlag[]> {
         const featureConfig = this.#configuration.get<FeatureManagementConfiguration>(FEATURE_MANAGEMENT_KEY);
-        return featureConfig?.[FEATURE_FLAGS_KEY] ?? [];
+        const featureFlag = featureConfig?.[FEATURE_FLAGS_KEY] ?? [];
+        validateFeatureFlag(featureFlag);
+        return featureFlag;
     }
 }
 
@@ -49,10 +54,14 @@ export class ConfigurationObjectFeatureFlagProvider implements IFeatureFlagProvi
 
     async getFeatureFlag(featureName: string): Promise<FeatureFlag | undefined> {
         const featureFlags = this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY];
-        return featureFlags?.findLast((feature: FeatureFlag) => feature.id === featureName);
+        const featureFlag = featureFlags?.findLast((feature: FeatureFlag) => feature.id === featureName);
+        validateFeatureFlag(featureFlag);
+        return featureFlag;
     }
 
     async getFeatureFlags(): Promise<FeatureFlag[]> {
-        return this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY] ?? [];
+        const featureFlag = this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY] ?? [];
+        validateFeatureFlag(featureFlag);
+        return featureFlag;
     }
 }

src/schema/validator.ts

@@ -33,6 +33,9 @@ export function validateFeatureFlag(featureFlag: any): void {
 }
 
 function validateFeatureEnablementConditions(conditions: any) {
+    if (typeof conditions !== "object") {
+        throw new TypeError("Feature flag 'conditions' must be an object.");
+    }
     if (conditions.requirement_type !== undefined && conditions.requirement_type !== "Any" && conditions.requirement_type !== "All") {
         throw new TypeError("'requirement_type' must be 'Any' or 'All'.");
     }
@@ -43,7 +46,7 @@ function validateFeatureEnablementConditions(conditions: any) {
 
 function validateClientFilters(client_filters: any) {
     if (!Array.isArray(client_filters)) {
-        throw new TypeError("'client_filters' must be an array.");
+        throw new TypeError("Feature flag conditions 'client_filters' must be an array.");
     }
 
     for (const filter of client_filters) {
@@ -58,7 +61,7 @@ function validateClientFilters(client_filters: any) {
 
 function validateVariants(variants: any) {
     if (!Array.isArray(variants)) {
-        throw new TypeError("'variants' must be an array.");
+        throw new TypeError("Feature flag 'variants' must be an array.");
     }
 
     for (const variant of variants) {
@@ -102,10 +105,13 @@ function validateVariantAllocation(allocation: any) {
 
 function validateUserVariantAllocation(UserAllocations: any) {
     if (!Array.isArray(UserAllocations)) {
-        throw new TypeError("User allocation 'user' must be an array.");
+        throw new TypeError("Variant 'user' allocation must be an array.");
     }
 
     for (const allocation of UserAllocations) {
+        if (typeof allocation !== "object") {
+            throw new TypeError("Elements in 'user' allocation must be an object.");
+        }
         if (typeof allocation.variant !== "string") {
             throw new TypeError("User allocation 'variant' must be a string.");
         }
@@ -114,18 +120,21 @@ function validateUserVariantAllocation(UserAllocations: any) {
         }
         for (const user of allocation.users) {
             if (typeof user !== "string") {
-                throw new TypeError("Elements in User allocation 'users' must be strings.");
+                throw new TypeError("Elements in user allocation 'users' must be strings.");
             }
         }
     }
 }
 
 function validateGroupVariantAllocation(groupAllocations: any) {
     if (!Array.isArray(groupAllocations)) {
-        throw new TypeError("Group allocation 'group' must be an array.");
+        throw new TypeError("Variant 'group' allocation must be an array.");
     }
 
     for (const allocation of groupAllocations) {
+        if (typeof allocation !== "object") {
+            throw new TypeError("Elements in 'group' allocation must be an object.");
+        }
         if (typeof allocation.variant !== "string") {
             throw new TypeError("Group allocation 'variant' must be a string.");
         }
@@ -134,18 +143,21 @@ function validateGroupVariantAllocation(groupAllocations: any) {
         }
         for (const group of allocation.groups) {
             if (typeof group !== "string") {
-                throw new TypeError("Elements in Group allocation 'groups' must be strings.");
+                throw new TypeError("Elements in group allocation 'groups' must be strings.");
             }
         }
     }
 }
 
 function validatePercentileVariantAllocation(percentileAllocations: any) {
     if (!Array.isArray(percentileAllocations)) {
-        throw new TypeError("Percentile allocation 'percentile' must be an array.");
+        throw new TypeError("Variant 'percentile' allocation must be an array.");
     }
 
     for (const allocation of percentileAllocations) {
+        if (typeof allocation !== "object") {
+            throw new TypeError("Elements in 'percentile' allocation must be an object.");
+        }
         if (typeof allocation.variant !== "string") {
             throw new TypeError("Percentile allocation 'variant' must be a string.");
         }
@@ -162,7 +174,7 @@ function validatePercentileVariantAllocation(percentileAllocations: any) {
 // #region Telemetry
 function validateTelemetryOptions(telemetry: any) {
     if (typeof telemetry !== "object") {
-        throw new TypeError("Telemetry option 'telemetry' must be an object.");
+        throw new TypeError("Feature flag 'telemetry' must be an object.");
     }
     if (telemetry.enabled !== undefined && typeof telemetry.enabled !== "boolean") {
         throw new TypeError("Telemetry 'enabled' must be a boolean.");