update FeatureFlagProvider per latest design

src/featureManager.ts

@@ -1,13 +1,16 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 import { TimewindowFilter } from "./filter/TimeWindowFilter";
 import { IFeatureFilter } from "./filter/FeatureFilter";
-import { FeatureDefinition, RequirementType } from "./model";
-import { IFeatureProvider } from "./featureProvider";
+import { RequirementType } from "./model";
+import { IFeatureFlagProvider } from "./featureProvider";
 
 export class FeatureManager {
-    #provider: IFeatureProvider;
+    #provider: IFeatureFlagProvider;
     #featureFilters: Map<string, IFeatureFilter> = new Map();
 
-    constructor(provider: IFeatureProvider, options?: FeatureManagerOptions) {
+    constructor(provider: IFeatureFlagProvider, options?: FeatureManagerOptions) {
         this.#provider = provider;
 
         const defaultFilters = [new TimewindowFilter()];
@@ -17,15 +20,14 @@ export class FeatureManager {
     }
 
     async listFeatureNames(): Promise<string[]> {
-        const features = await this.#features();
+        const features = await this.#provider.getFeatureFlags();
         const featureNameSet = new Set(features.map((feature) => feature.id));
         return Array.from(featureNameSet);
     }
 
     // If multiple feature flags are found, the first one takes precedence.
-    async isEnabled(featureId: string, context?: unknown): Promise<boolean> {
-        const features = await this.#features();
-        const featureFlag = features.find((flag) => flag.id === featureId);
+    async isEnabled(featureName: string, context?: unknown): Promise<boolean> {
+        const featureFlag = await this.#provider.getFeatureFlag(featureName);
         if (featureFlag === undefined) {
             // If the feature is not found, then it is disabled.
             return false;
@@ -64,11 +66,6 @@ export class FeatureManager {
         }
     }
 
-    async #features(): Promise<FeatureDefinition[]> {
-        const features = await this.#provider.getFeatureFlags();
-        return features;
-    }
-
 }
 
 interface FeatureManagerOptions {

src/featureProvider.ts

@@ -1,26 +1,58 @@
-import { IGettable, isGettable } from "./gettable";
-import { FeatureDefinition, FeatureConfiguration, FEATURE_MANAGEMENT_KEY, FEATURE_FLAGS_KEY } from "./model";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 
-export interface IFeatureProvider {
-    getFeatureFlags(): Promise<FeatureDefinition[]>;
+import { IGettable } from "./gettable";
+import { FeatureFlag, FeatureManagementConfiguration, FEATURE_MANAGEMENT_KEY, FEATURE_FLAGS_KEY } from "./model";
+
+export interface IFeatureFlagProvider {
+    /**
+     * Get all feature flags.
+     */
+    getFeatureFlags(): Promise<FeatureFlag[]>;
+
+    /**
+     * Get a feature flag by name.
+     * @param featureName The name of the feature flag.
+     */
+    getFeatureFlag(featureName: string): Promise<FeatureFlag | undefined>;
+}
+
+/**
+ * A feature flag provider that uses a map-like configuration to provide feature flags.
+ */
+export class ConfigurationMapFeatureFlagProvider implements IFeatureFlagProvider {
+    #configuration: IGettable;
+
+    constructor(configuration: IGettable) {
+        this.#configuration = configuration;
+    }
+    async getFeatureFlag(featureName: string): Promise<FeatureFlag | undefined> {
+        const featureConfig = this.#configuration.get<FeatureManagementConfiguration>(FEATURE_MANAGEMENT_KEY);
+        return featureConfig?.[FEATURE_FLAGS_KEY]?.find((feature) => feature.id === featureName);
+    }
+
+    async getFeatureFlags(): Promise<FeatureFlag[]> {
+        const featureConfig = this.#configuration.get<FeatureManagementConfiguration>(FEATURE_MANAGEMENT_KEY);
+        return featureConfig?.[FEATURE_FLAGS_KEY] ?? [];
+    }
 }
 
-export class ConfigurationFeatureProvider implements IFeatureProvider {
-    #configuration: IGettable | Record<string, unknown>;
+/**
+ * A feature flag provider that uses an object-like configuration to provide feature flags.
+ */
+export class ConfigurationObjectFeatureFlagProvider implements IFeatureFlagProvider {
+    #configuration: Record<string, unknown>;
 
-    constructor(configuration: Record<string, unknown> | IGettable) {
-        if (typeof configuration !== "object") {
-            throw new Error("Configuration must be an object.");
-        }
+    constructor(configuration: Record<string, unknown>) {
         this.#configuration = configuration;
     }
 
-    async getFeatureFlags(): Promise<FeatureDefinition[]> {
-        if (isGettable(this.#configuration)) {
-            const featureConfig = this.#configuration.get<FeatureConfiguration>(FEATURE_MANAGEMENT_KEY);
-            return featureConfig?.[FEATURE_FLAGS_KEY] ?? [];
-        } else {
-            return this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY] ?? [];
-        }
+    async getFeatureFlag(featureName: string): Promise<FeatureFlag | undefined> {
+        const featureFlags = this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY];
+        return featureFlags?.find((feature: FeatureFlag) => feature.id === featureName);
+    }
+
+    async getFeatureFlags(): Promise<FeatureFlag[]> {
+        return this.#configuration[FEATURE_MANAGEMENT_KEY]?.[FEATURE_FLAGS_KEY] ?? [];
     }
 }

src/filter/FeatureFilter.ts

@@ -1,3 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 
 export interface IFeatureFilter {
     name: string; //e.g. Microsoft.TimeWindow

src/filter/TargetingFilter.ts

@@ -1,3 +1,5 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 
 interface TargetingParameters {
     // TODO: add targeting parameters.

src/filter/TimeWindowFilter.ts

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 import { IFeatureFilter } from "./FeatureFilter";
 
 // [Start, End)

src/gettable.ts

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
 export interface IGettable {
     get<T>(key: string): T | undefined;
 }

src/index.ts

@@ -2,4 +2,4 @@
 // Licensed under the MIT license.
 
 export { FeatureManager } from "./featureManager";
-export { ConfigurationFeatureProvider, IFeatureProvider } from "./featureProvider";
+export { ConfigurationMapFeatureFlagProvider, ConfigurationObjectFeatureFlagProvider, IFeatureFlagProvider } from "./featureProvider";

src/model.ts

@@ -3,7 +3,7 @@
 
 // Converted from https://github.com/Azure/AppConfiguration/blob/main/docs/FeatureManagement/FeatureFlag.v1.1.0.schema.json
 
-export interface FeatureDefinition {
+export interface FeatureFlag {
   /**
    * An ID used to uniquely identify and reference the feature.
    */
@@ -59,8 +59,18 @@ export interface ClientFilter {
 }
 
 // Feature Management Section fed into feature manager.
-export const FEATURE_MANAGEMENT_KEY = "FeatureManagement"
-export const FEATURE_FLAGS_KEY = "FeatureFlags"
-export interface FeatureConfiguration {
-  [FEATURE_FLAGS_KEY]: FeatureDefinition[]
+// Converted from https://github.com/Azure/AppConfiguration/blob/main/docs/FeatureManagement/FeatureManagement.v1.0.0.schema.json
+
+export const FEATURE_MANAGEMENT_KEY = "feature_management"
+export const FEATURE_FLAGS_KEY = "feature_flags"
+
+export interface FeatureManagementConfiguration {
+  feature_management: FeatureManagement
 }
+
+/**
+ * Declares feature management configuration.
+ */
+export interface FeatureManagement {
+  feature_flags: FeatureFlag[];
+}

test/featureManager.test.ts

@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
-import { FeatureManager, ConfigurationFeatureProvider } from "./exportedApi";
+import { FeatureManager, ConfigurationObjectFeatureFlagProvider, ConfigurationMapFeatureFlagProvider } from "./exportedApi";
 
 describe("feature manager", () => {
     it("should load from json string", () => {
@@ -18,7 +18,7 @@ describe("feature manager", () => {
             }
         };
 
-        const provider = new ConfigurationFeatureProvider(jsonObject);
+        const provider = new ConfigurationObjectFeatureFlagProvider(jsonObject);
         const featureManager = new FeatureManager(provider);
         return expect(featureManager.isEnabled("Alpha")).eventually.eq(true);
     });
@@ -31,11 +31,30 @@ describe("feature manager", () => {
             ],
         });
 
-        const provider = new ConfigurationFeatureProvider(dataSource);
+        const provider = new ConfigurationMapFeatureFlagProvider(dataSource);
         const featureManager = new FeatureManager(provider);
         return expect(featureManager.isEnabled("Alpha")).eventually.eq(true);
     });
 
+    it("should load latest data if source is updated after initialization", () => {
+        const dataSource = new Map();
+        dataSource.set("FeatureManagement", {
+            FeatureFlags: [
+                { id: "Alpha", enabled: true }
+            ],
+        });
+
+        const provider = new ConfigurationMapFeatureFlagProvider(dataSource);
+        const featureManager = new FeatureManager(provider);
+        dataSource.set("FeatureManagement", {
+            FeatureFlags: [
+                { id: "Alpha", enabled: false }
+            ],
+        });
+
+        return expect(featureManager.isEnabled("Alpha")).eventually.eq(false);
+    });
+
     it("shoud evaluate features without conditions", () => {
         const dataSource = new Map();
         dataSource.set("FeatureManagement", {
@@ -45,7 +64,7 @@ describe("feature manager", () => {
             ],
         });
 
-        const provider = new ConfigurationFeatureProvider(dataSource);
+        const provider = new ConfigurationMapFeatureFlagProvider(dataSource);
         const featureManager = new FeatureManager(provider);
         return Promise.all([
             expect(featureManager.isEnabled("Alpha")).eventually.eq(true),