Merge pull request #21 from masonlet/feat/multi-source-stats

Feat/multi source stats

Author: masonlet

.env.example

@@ -1,2 +1,3 @@
-GITHUB_USERNAME=your_username
+GITHUB_USERNAMES=your_username(s)
+GITHUB_ORGS=
 IGNORED_REPOS=repo-name1,repo-name2,repo-name3

src/api/github.js

@@ -13,16 +13,26 @@ export async function fetchLanguageData(useTestData = false) {
   if (cachedLanguageData && now - lastRefresh < REFRESH_INTERVAL) 
     return cachedLanguageData;
 
-  const username = process.env.GITHUB_USERNAME;
-  if(!username) throw new Error(`GITHUB_USERNAME environment variable is not set`);
+  const usernames = process.env.GITHUB_USERNAMES?.split(',').map(u => u.trim()).filter(Boolean) || [];
+  const orgs = process.env.GITHUB_ORGS?.split(',').map(o => o.trim()).filter(Boolean) || [];
 
-  const reposResponse = await fetch(`https://api.github.com/users/${username}/repos?per_page=100`);
-  if(!reposResponse.ok) 
-    throw new Error(`GitHub API error: ${reposResponse.status} ${reposResponse.statusText}`);
+  if(usernames.length === 0 && orgs.length === 0) 
+    throw new Error("At least one of GITHUB_USERNAMES or GITHUB_ORGS must be set");
 
-  const repos = await reposResponse.json();
-  const ignored = process.env.IGNORED_REPOS?.split(',').map(name => name.trim()) || [];
+  const fetchPromises = [
+    ...usernames.map(user => fetch(`https://api.github.com/users/${user}/repos?per_page=100`)),
+    ...orgs.map(org => fetch(`https://api.github.com/orgs/${org}/repos?per_page=100`))
+  ];
+
+  const responses = await Promise.all(fetchPromises);
+
+  for (const response of responses) 
+    if (!response.ok) throw new Error(`GitHub API error: ${response.status} ${response.statusText}`);
 
+  const repoArrays = await Promise.all(responses.map(r => r.json()));
+  const repos = repoArrays.flat();
+
+  const ignored = process.env.IGNORED_REPOS?.split(',').map(name => name.trim()) || [];
   const filteredRepos = repos.filter(repo => !repo.fork && !ignored.includes(repo.name));
 
   const languageFetches = filteredRepos.map(repo =>

tests/api/github.test.js

@@ -15,8 +15,8 @@ const languages = {
 
 describe("fetchLanguageData", () => {
   beforeEach(() => {
-    vi.stubEnv('GITHUB_USERNAME', 'testuser');
-    vi.stubEnv('IGNORED_REPOS', 'ignored-repo');
+    vi.stubEnv("GITHUB_USERNAMES", "testuser");
+    vi.stubEnv("IGNORED_REPOS", "ignored-repo");
     global.fetch = vi.fn();
     vi.resetModules();
     resetCache();
@@ -33,14 +33,14 @@ describe("fetchLanguageData", () => {
     expect(global.fetch).not.toHaveBeenCalled();
   });
 
-  it("throws error when GITHUB_USERNAME env variable not set", async () => {
+  it("throws error when GITHUB_USERNAMES env variable not set", async () => {
     vi.unstubAllEnvs();
-    await expect(fetchLanguageData()).rejects.toThrow('GITHUB_USERNAME environment variable is not set');
+    await expect(fetchLanguageData()).rejects.toThrow("At least one of GITHUB_USERNAMES or GITHUB_ORGS must be set");
   });
 
   it("handles missing IGNORED_REPOS env variable", async () => {
     vi.unstubAllEnvs();
-    vi.stubEnv('GITHUB_USERNAME', 'testuser');
+    vi.stubEnv("GITHUB_USERNAMES", "testuser");
 
     global.fetch
       .mockResolvedValueOnce({ ok: true, json: async () => repos })
@@ -64,17 +64,17 @@ describe("fetchLanguageData", () => {
     await fetchLanguageData();
 
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://api.github.com/users/testuser/repos?per_page=100'
+      "https://api.github.com/users/testuser/repos?per_page=100"
     );
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://api.github.com/repos/user/repo1/languages'
+      "https://api.github.com/repos/user/repo1/languages"
     );
 
     expect(global.fetch).not.toHaveBeenCalledWith(
-      'https://api.github.com/repos/user/repo2/languages'
+      "https://api.github.com/repos/user/repo2/languages"
     );
     expect(global.fetch).not.toHaveBeenCalledWith(
-      'https://api.github.com/repos/user/ignored-repo/languages'
+      "https://api.github.com/repos/user/ignored-repo/languages"
     );
   });
 
@@ -97,10 +97,10 @@ describe("fetchLanguageData", () => {
     global.fetch.mockResolvedValueOnce({ 
       ok: false, 
       status: 404, 
-      statusText: 'Not Found' 
+      statusText: "Not Found" 
     });
 
-    await expect(fetchLanguageData()).rejects.toThrow('GitHub API error: 404 Not Found');
+    await expect(fetchLanguageData()).rejects.toThrow("GitHub API error: 404 Not Found");
   });
 
   it("caches results within refresh interval", async () => {
@@ -128,33 +128,53 @@ describe("fetchLanguageData", () => {
     const result = await fetchLanguageData();
     expect(result).toEqual({ Python: 500 });
   });
+
+  it("fetches from organizations", async () => {
+    vi.unstubAllEnvs();
+    vi.stubEnv("GITHUB_ORGS", "test-org");
+
+    const orgRepos = [
+      { name: "org-repo", fork: false, full_name: "test-org/org-repo" }
+    ];
+
+    global.fetch
+      .mockResolvedValueOnce({ ok: true, json: async () => orgRepos })
+      .mockResolvedValueOnce({ ok: true, json: async () => ({ TypeScript: 4000 }) })
+
+    const result = await fetchLanguageData();
+
+    expect(global.fetch).toHaveBeenCalledWith(
+      "https://api.github.com/orgs/test-org/repos?per_page=100"
+    );
+    expect(result).toEqual({ TypeScript: 4000 });
+  });
 });
 
 describe("processLanguageData", () => {
   it("calculates percentages correctly", () => {
     const data = { JavaScript: 5000, Python: 3000, HTML: 2000 };
     const result = processLanguageData(data, 3);
     expect(result).toHaveLength(3);
-    expect(result[0]).toEqual({ lang: 'JavaScript', pct: 50 });
-    expect(result[1]).toEqual({ lang: 'Python', pct: 30 });
-    expect(result[2]).toEqual({ lang: 'HTML', pct: 20 });
+    expect(result[0]).toEqual({ lang: "JavaScript", pct: 50 });
+    expect(result[1]).toEqual({ lang: "Python", pct: 30 });
+    expect(result[2]).toEqual({ lang: "HTML", pct: 20 });
   });
 
   it("sorts by percentage descending", () => {
     const data = { HTML: 1000, JavaScript: 5000, Python: 3000 };
     const result = processLanguageData(data, 3);
 
-    expect(result[0].lang).toBe('JavaScript');
-    expect(result[1].lang).toBe('Python');
-    expect(result[2].lang).toBe('HTML');
+    expect(result[0].lang).toBe("JavaScript");
+    expect(result[1].lang).toBe("Python");
+    expect(result[2].lang).toBe("HTML");
   });
 
   it("limits to count", () => {
     const data = { JavaScript: 5000, Python: 3000, HTML: 2000, CSS: 1000 };
     const result = processLanguageData(data, 2);
 
     expect(result).toHaveLength(2);
-    expect(result.map(l => l.lang)).toEqual(['JavaScript', 'Python']);
+    expect(result.map(l => l.lang)).toEqual(["JavaScript", "Python"]);
   });
 
   it("renormalizes percentages after slicing", () => {
@@ -166,6 +186,6 @@ describe("processLanguageData", () => {
   });
 
   it("throws when no language data", () => {
-    expect(() => processLanguageData({}, 5)).toThrow('No language data available');
+    expect(() => processLanguageData({}, 5)).toThrow("No language data available");
   });
 });

tests/utils/params.test.js

@@ -38,7 +38,7 @@ describe("parseQueryParams", () => {
 
   it("sanitizes title when provided", () => {
     const params = parseQueryParams({ title: `<scripts>alert("x")</script>` });
-    expect(params.chartTitle).toBe(`&lt;scripts&gt;alert(&quot;x&quot;)&lt;/script&gt;`);
+    expect(params.chartTitle).toBe("&lt;scripts&gt;alert(&quot;x&quot;)&lt;/script&gt;");
   });
 
   it("clamps count between 1 and MAX_COUNT", () => {

tests/utils/sanitize.test.js

@@ -11,14 +11,14 @@ describe("sanitize", () => {
   });
 
   it("escapes the criticial HTML characters", () => {
-    expect(sanitize(`<>&"'`)).toBe(`&lt;&gt;&amp;&quot;&#39;`);
+    expect(sanitize(`<>&"'`)).toBe("&lt;&gt;&amp;&quot;&#39;");
   });
 
   it("leaves safe strings unchanged", () => {
     expect(sanitize("Hello world")).toBe("Hello world");
   });
 
   it("escapes mixed content correctly", () => {
-    expect(sanitize(`Hi <Mason> & "team"`)).toBe(`Hi &lt;Mason&gt; &amp; &quot;team&quot;`);
+    expect(sanitize(`Hi <Mason> & "team"`)).toBe("Hi &lt;Mason&gt; &amp; &quot;team&quot;");
   });
 });