Refactor mapClientID2NameSorted to process mixed arrays with keyword markers

Author: kushalshit27

src/utils.ts

@@ -220,14 +220,15 @@ export function mapClientID2NameSorted(
     return [];
   }
 
-  // If any element in the array contains keyword markers, return the array as-is
-  if (Array.isArray(enabledClients) && enabledClients.some((client) => hasKeywordMarkers(client))) {
-    return enabledClients;
-  }
+  // Process each element: preserve keyword markers, convert client IDs to names
+  const processedClients = enabledClients.map((client) => {
+    if (hasKeywordMarkers(client)) {
+      return client;
+    }
+    return convertClientIdToName(client, knownClients);
+  });
 
-  return [
-    ...(enabledClients || []).map((clientId) => convertClientIdToName(clientId, knownClients)),
-  ].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+  return processedClients.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
 }
 
 export function nomalizedYAMLPath(filePath: string): string[] {

test/tools/utils.test.ts

@@ -121,15 +121,16 @@ describe('#mapClientID2NameSorted', () => {
     expect(result).to.deep.equal([]);
   });
 
-  it('should handle null/undefined enabled clients', () => {
-    const result = mapClientID2NameSorted(null, mockClients);
-    expect(result).to.deep.equal([]);
+  it('should handle empty string enabled clients', () => {
+    const result = mapClientID2NameSorted('', mockClients);
+    expect(result).to.deep.equal('');
   });
 
   it('should preserve keyword markers in arrays', () => {
-    const enabledClientsWithKeywords = ['@@CLIENT_KEYWORD@@', 'client-a-id'];
+    const enabledClientsWithKeywords = ['##CLIENT_KEYWORD##', 'client-a-id'];
     const result = mapClientID2NameSorted(enabledClientsWithKeywords, mockClients);
-    // When an array contains keyword markers, the entire array should be returned as-is
-    expect(result).to.deep.equal(enabledClientsWithKeywords);
+
+    const expectedClientsWithKeywords = ['##CLIENT_KEYWORD##', 'Client A'];
+    expect(result).to.deep.equal(expectedClientsWithKeywords);
   });
 });