Merge branch 'main' of https://github.com/Azure/AppConfiguration-JavaScriptProvider into zhiyuanliang/node-version-tracing

Author: zhiyuanliang-ms

examples/console-app/configObject.mjs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as dotenv from "dotenv";
-dotenv.config()
+dotenv.config();
 
 /**
  * This example demonstrates how to construct a configuration object from settings loaded from Azure App Configuration.

examples/console-app/helloworld.mjs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as dotenv from "dotenv";
-dotenv.config()
+dotenv.config();
 
 /**
  * This example retrives all settings with key following pattern "app.settings.*", i.e. starting with "app.settings.".
@@ -23,4 +23,4 @@ const settings = await load(connectionString, {
 });
 const message = settings.get("message");
 
-console.log(`Message from Azure App Configuration: ${message}`);
+console.log(`Message from Azure App Configuration: ${message}`);

examples/console-app/helloworld_aad.mjs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as dotenv from "dotenv";
-dotenv.config()
+dotenv.config();
 
 /**
  * This example retrives all settings with key following pattern "app.settings.*", i.e. starting with "app.settings.".
@@ -28,4 +28,4 @@ const settings = await load(endpoint, credential, {
 });
 const message = settings.get("message");
 
-console.log(`Message from Azure App Configuration: ${message}`);
+console.log(`Message from Azure App Configuration: ${message}`);

examples/console-app/refresh.mjs

@@ -30,7 +30,7 @@ const settings = await load(connectionString, {
     }
 });
 
-console.log("Using Azure portal or CLI, update the `app.settings.message` value, and then update the `app.settings.sentinel` value in your App Configuration store.")
+console.log("Using Azure portal or CLI, update the `app.settings.message` value, and then update the `app.settings.sentinel` value in your App Configuration store.");
 
 // eslint-disable-next-line no-constant-condition
 while (true) {

examples/console-app/secretReference.mjs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as dotenv from "dotenv";
-dotenv.config()
+dotenv.config();
 
 /**
  * Before you run it, please add a Key Vault reference with key "app.secret" in your App Configuration store.
@@ -28,4 +28,4 @@ const settings = await load(endpoint, credential, {
 const secretKey = "app.secret";
 const value = settings.get(secretKey);
 
-console.log(`Get the secret from keyvault key: ${secretKey}, value: ${value}`);
+console.log(`Get the secret from keyvault key: ${secretKey}, value: ${value}`);

examples/web-app/httpserver.mjs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as dotenv from "dotenv";
-dotenv.config()
+dotenv.config();
 
 import { load } from "@azure/app-configuration-provider";
 import { DefaultAzureCredential } from "@azure/identity";

package.json

@@ -23,8 +23,8 @@
     "build-test": "tsc -p ./tsconfig.test.json",
     "clean": "rimraf dist dist-esm out types",
     "dev": "rollup --config --watch",
-    "lint": "eslint src/ test/",
-    "fix-lint": "eslint src/ test/ --fix",
+    "lint": "eslint src/ test/ examples/ --ext .js,.ts,.mjs,.cjs",
+    "fix-lint": "eslint src/ test/ examples/ --fix --ext .js,.ts,.mjs,.cjs",
     "test": "mocha out/test/*.test.{js,cjs,mjs} --parallel"
   },
   "repository": {

src/appConfigurationImpl.ts

@@ -482,7 +482,9 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     async #loadConfigurationSettings(loadFeatureFlag: boolean = false): Promise<ConfigurationSetting[]> {
         const selectors = loadFeatureFlag ? this.#ffSelectors : this.#kvSelectors;
         const funcToExecute = async (client) => {
-            const loadedSettings: ConfigurationSetting[] = [];
+            // Use a Map to deduplicate configuration settings by key. When multiple selectors return settings with the same key,
+            // the configuration setting loaded by the later selector in the iteration order will override the one from the earlier selector.
+            const loadedSettings: Map<string, ConfigurationSetting> = new Map<string, ConfigurationSetting>();
             // deep copy selectors to avoid modification if current client fails
             const selectorsToUpdate = JSON.parse(
                 JSON.stringify(selectors)
@@ -506,7 +508,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                         pageEtags.push(page.etag ?? "");
                         for (const setting of page.items) {
                             if (loadFeatureFlag === isFeatureFlag(setting)) {
-                                loadedSettings.push(setting);
+                                loadedSettings.set(setting.key, setting);
                             }
                         }
                     }
@@ -528,7 +530,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                     for await (const page of pageIterator) {
                         for (const setting of page.items) {
                             if (loadFeatureFlag === isFeatureFlag(setting)) {
-                                loadedSettings.push(setting);
+                                loadedSettings.set(setting.key, setting);
                             }
                         }
                     }
@@ -540,7 +542,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
             } else {
                 this.#kvSelectors = selectorsToUpdate;
             }
-            return loadedSettings;
+            return Array.from(loadedSettings.values());
         };
 
         return await this.#executeWithFailoverPolicy(funcToExecute) as ConfigurationSetting[];