@stats-forge/github-stats-forge-core 0.0.2 → 0.2.0

package/build/fetchers/top-languages.js

@@ -1,21 +1,13 @@
-import { CardError, USER_NOT_FOUND } from '../common/error.js';
-import { wrapTextMultiline } from '../common/fmt.js';
+import { CardError } from '../common/error.js';
 import { createGraphQLFetcher } from '../common/http.js';
-import { logger } from '../common/log.js';
 import { parseOwnerAffiliations } from '../common/ops.js';
 import { retryer } from '../common/retryer.js';
 import { TopLanguagesDocument } from '../graphql/generated/top-languages.js';
+import { graphqlError } from './graphql-error.js';
 const fetcher = createGraphQLFetcher(TopLanguagesDocument, 'token');
 /**
  * Fetch top languages for a given username.
  *
- * @param props Fetcher props.
- * @param props.username GitHub username.
- * @param props.exclude_repo List of repositories to exclude. Default: [].
- * @param props.size_weight Weightage to be given to size.
- * @param props.count_weight Weightage to be given to count.
- * @param props.ownerAffiliations The owner affiliations to filter by. Default: OWNER.
- * @param config Deployment config supplying the PAT pool.
  * @returns Top languages data.
  */
 const fetchTopLanguages = async ({ username, exclude_repo = [], size_weight = 1, count_weight = 0, ownerAffiliations = [], }, config) => {
@@ -28,62 +20,39 @@ const fetchTopLanguages = async ({ username, exclude_repo = [], size_weight = 1,
         ownerAffiliations: affiliations,
     }, config);
     if (res.data.errors) {
-        logger.error(res.data.errors);
-        const firstError = res.data.errors[0];
-        if (firstError?.type === 'NOT_FOUND') {
-            throw new CardError(firstError.message || 'Could not fetch user.', {
-                code: 'not_found',
-                secondaryMessage: USER_NOT_FOUND,
-            });
-        }
-        if (firstError?.message) {
-            throw new CardError(wrapTextMultiline(firstError.message, 525, 12)[0] ?? '', {
-                code: 'upstream',
-                secondaryMessage: res.statusText,
-            });
-        }
-        throw new CardError('Something went wrong while trying to retrieve the language data using the GraphQL API.', { code: 'upstream' });
+        throw graphqlError(res.data.errors, res.statusText, 'Something went wrong while trying to retrieve the language data using the GraphQL API.');
     }
     const repoToHide = {};
     const allExcludedRepos = [...exclude_repo, ...config.excludeRepositories];
     // populate repoToHide map for quick lookup while filtering out
-    allExcludedRepos.forEach((repoName) => {
+    for (const repoName of allExcludedRepos) {
         repoToHide[repoName] = true;
-    });
+    }
     // filter out repositories to be hidden
     const repoNodes = (res.data.data.user?.repositories.nodes ?? []).filter((node) => !!node && !repoToHide[node.name]);
-    // flatten edges across repos. Order matters: `concat(acc)` prepends, and the
-    // shared repoCount below depends on visitation order.
-    const languageEdges = repoNodes.reduce((acc, repo) => {
+    let languageEdges = [];
+    for (const repo of repoNodes) {
         const edges = (repo.languages?.edges ?? []).filter((edge) => !!edge);
-        return edges.length > 0 ? edges.concat(acc) : acc;
-    }, []);
-    // accumulate size and repo count per language
+        if (edges.length > 0) {
+            languageEdges = [...edges, ...languageEdges];
+        }
+    }
+    // accumulate size and repo count per language, each read back off the language's own entry
     const languageMap = {};
-    let repoCount = 0;
     for (const edge of languageEdges) {
         const existing = languageMap[edge.node.name];
-        // same language seen again: add to its size and bump count; else reset to 1
-        let langSize = edge.size;
-        if (existing && edge.node.name === existing.name) {
-            langSize = edge.size + existing.size;
-            repoCount += 1;
-        }
-        else {
-            repoCount = 1;
-        }
         languageMap[edge.node.name] = {
             name: edge.node.name,
             color: edge.node.color,
-            size: langSize,
-            count: repoCount,
+            size: edge.size + (existing?.size ?? 0),
+            count: (existing?.count ?? 0) + 1,
         };
     }
     // comparison index calculation
     for (const lang of Object.values(languageMap)) {
-        lang.size = Math.pow(lang.size, size_weight) * Math.pow(lang.count, count_weight);
+        lang.size = lang.size ** size_weight * lang.count ** count_weight;
     }
     // return languages sorted by (weighted) size, descending
-    return Object.fromEntries(Object.entries(languageMap).sort(([, a], [, b]) => b.size - a.size));
+    return Object.fromEntries(Object.entries(languageMap).toSorted(([, a], [, b]) => b.size - a.size));
 };
 export { fetchTopLanguages };

package/build/fetchers/types.d.ts

@@ -1,4 +1,5 @@
-import type { RepoInfoFragment } from '../graphql/generated/repo.js';
+import type { GitHubDateRange } from '../common/date.ts';
+import type { RepoInfoFragment } from '../graphql/generated/repo.ts';
 export interface GistData {
     name: string;
     nameWithOwner: string;
@@ -33,6 +34,8 @@ export interface StatsData {
     mergedPRsPercentage: number;
     totalReviews: number;
     totalCommits: number;
+    /** The range `totalCommits` covers; `undefined` when it is GitHub's own last year, or all time. */
+    commitsRange: GitHubDateRange | undefined;
     totalIssues: number;
     totalStars: number;
     totalDiscussionsStarted: number;
@@ -50,6 +53,27 @@ export interface StatsData {
         percentile: number;
     };
 }
+/** One repository a user contributed to, as the card ranks it. */
+export interface ContributedRepo {
+    nameWithOwner: string;
+    /**
+     * Commit-days plus issues and pull requests opened, summed over every year.
+     * Not a commit count: GitHub groups commit contributions by day, not by commit.
+     */
+    contributions: number;
+    /** Every year the user contributed to it, ascending. */
+    years: Array<number>;
+}
+export interface ContributedToData {
+    /** GitHub's own casing of the login, which the query param need not match. */
+    login: string;
+    /** The ranked slice, most contributions first. */
+    repos: Array<ContributedRepo>;
+    /** Every repository the walk found, which `repos` is a slice of. */
+    totalRepos: number;
+    /** The account's contribution years, ascending — the range the year marks cover. */
+    years: Array<number>;
+}
 export interface Lang {
     name: string;
     color: string | null;

package/build/fetchers/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fetchers/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fetchers/types.ts"],"names":[],"mappings":"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"}

package/build/fetchers/wakatime.d.ts

@@ -1,14 +1,10 @@
-import type { CardConfig } from '../common/config.js';
-import type { WakaTimeData } from './types.js';
+import type { CardConfig } from '../common/config.ts';
+import type { WakaTimeData } from './types.ts';
 /**
  * WakaTime data fetcher.
  *
  * WakaTime needs no GitHub token; the config is here for the transport it carries.
  *
- * @param props Fetcher props.
- * @param props.username WakaTime username.
- * @param props.api_domain Optional WakaTime API domain (defaults to `wakatime.com`).
- * @param config Deployment config supplying the transport.
  * @returns WakaTime data response.
  */
 declare const fetchWakatimeStats: ({ username, api_domain, }: {

package/build/fetchers/wakatime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wakatime.d.ts","sourceRoot":"","sources":["../../src/fetchers/wakatime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,QAAA,MAAM,kBAAkB,GACtB,2BAGG;IACD,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,EACD,QAAQ,UAAU,KACjB,OAAO,CAAC,YAAY,CA2BtB,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"wakatime.d.ts","sourceRoot":"","sources":["../../src/fetchers/wakatime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;;;;;GAMG;AACH,QAAA,MAAM,kBAAkB,8BAInB;IACD,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,UACO,UAAU,KACjB,OAAO,CAAC,YAAY,CA2BtB,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/build/fetchers/wakatime.js

@@ -5,17 +5,13 @@ import { httpRequest } from '../common/http.js';
  *
  * WakaTime needs no GitHub token; the config is here for the transport it carries.
  *
- * @param props Fetcher props.
- * @param props.username WakaTime username.
- * @param props.api_domain Optional WakaTime API domain (defaults to `wakatime.com`).
- * @param config Deployment config supplying the transport.
  * @returns WakaTime data response.
  */
 const fetchWakatimeStats = async ({ username, api_domain, }, config) => {
     if (!username) {
         throw CardError.missingParam(['username']);
     }
-    const domain = api_domain ? api_domain.replace(/\/$/gi, '') : 'wakatime.com';
+    const domain = api_domain ? api_domain.replaceAll(/\/$/gi, '') : 'wakatime.com';
     const res = await httpRequest(config.fetch, `https://${domain}/api/v1/users/${username}/stats?is_including_today=true`);
     // Only a 404 says the profile does not exist.
     // Any other failure is WakaTime being unavailable, which a retry can still answer,

package/build/graphql/contributionsCollection.d.ts

@@ -0,0 +1,9 @@
+import type { GitHubDateRange } from '../common/date.ts';
+/**
+ * One `contributionsCollection` field per range, aliased by position.
+ *
+ * @returns The fields, for a query that selects `fragment`.
+ */
+declare const aliasedRanges: (ranges: Array<GitHubDateRange>, fragment: string) => string;
+export { aliasedRanges };
+//# sourceMappingURL=contributionsCollection.d.ts.map

package/build/graphql/contributionsCollection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contributionsCollection.d.ts","sourceRoot":"","sources":["../../src/graphql/contributionsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOzD;;;;GAIG;AACH,QAAA,MAAM,aAAa,WAAY,KAAK,CAAC,eAAe,CAAC,YAAY,MAAM,KAAG,MAG3D,CAAC;AAEhB,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/build/graphql/contributionsCollection.js

@@ -0,0 +1,12 @@
+import { toGitHubDateTime } from '../common/date.js';
+/** Naming `to` is not optional: GitHub defaults an omitted one to a year after `from`. */
+const contributionsCollectionOf = ({ from, to }) => `contributionsCollection(from: "${toGitHubDateTime(from)}", to: "${toGitHubDateTime(to)}")`;
+/**
+ * One `contributionsCollection` field per range, aliased by position.
+ *
+ * @returns The fields, for a query that selects `fragment`.
+ */
+const aliasedRanges = (ranges, fragment) => ranges
+    .map((range, index) => `range_${index}: ${contributionsCollectionOf(range)} { ...${fragment} }`)
+    .join('\n');
+export { aliasedRanges };

package/build/graphql/contributionsDocument.d.ts

@@ -1,18 +1,18 @@
-import type { YearContributionsFragment } from './generated/stats.js';
+import type { GitHubDateRange } from '../common/date.ts';
+import type { RangeContributionsFragment } from './generated/stats.ts';
+import type { GraphQLDocument } from './graphqlDocument.ts';
 interface ContributionsQueryVariables {
     login: string;
 }
 interface ContributionsQuery {
-    user: Record<`year_${number}`, YearContributionsFragment> | null;
+    user: Record<`range_${number}`, RangeContributionsFragment> | null;
 }
 /**
- * Build the all-time contributions query, one aliased `contributionsCollection` field per year.
- * The shape is only known at runtime.
+ * Build the contributions query for a set of ranges. The shape is only known at runtime.
  *
- * @param years Contribution years, one `year_<year>` alias each.
  * @returns Document for `createGraphQLFetcher`.
  */
-declare const buildContributionsDocument: (years: Array<number>) => import("./graphqlDocument.js").GraphQLDocument<ContributionsQuery, ContributionsQueryVariables>;
+declare const buildContributionsDocument: (ranges: Array<GitHubDateRange>) => GraphQLDocument<ContributionsQuery, ContributionsQueryVariables>;
 export { buildContributionsDocument };
 export type { ContributionsQuery };
 //# sourceMappingURL=contributionsDocument.d.ts.map

package/build/graphql/contributionsDocument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contributionsDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/contributionsDocument.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAGtE,UAAU,2BAA2B;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC,QAAQ,MAAM,EAAE,EAAE,yBAAyB,CAAC,GAAG,IAAI,CAAC;CAClE;AAED;;;;;;GAMG;AACH,QAAA,MAAM,0BAA0B,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,oGAoBvD,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC;AACtC,YAAY,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"contributionsDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/contributionsDocument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,UAAU,2BAA2B;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,0BAA0B,CAAC,GAAG,IAAI,CAAC;CACpE;AAED;;;;GAIG;AACH,QAAA,MAAM,0BAA0B,WACtB,KAAK,CAAC,eAAe,CAAC,KAC7B,eAAe,CAAC,kBAAkB,EAAE,2BAA2B,CAa/D,CAAC;AAEJ,OAAO,EAAE,0BAA0B,EAAE,CAAC;AACtC,YAAY,EAAE,kBAAkB,EAAE,CAAC"}

package/build/graphql/contributionsDocument.js

@@ -1,30 +1,22 @@
-import { getGitHubYearRange, toGitHubDateTime } from '../common/date.js';
+import { aliasedRanges } from './contributionsCollection.js';
 import { graphqlDocument } from './graphqlDocument.js';
 /**
- * Build the all-time contributions query, one aliased `contributionsCollection` field per year.
- * The shape is only known at runtime.
+ * Build the contributions query for a set of ranges. The shape is only known at runtime.
  *
- * @param years Contribution years, one `year_<year>` alias each.
  * @returns Document for `createGraphQLFetcher`.
  */
-const buildContributionsDocument = (years) => {
-    const yearFields = years
-        .map((year) => {
-        const { from, to } = getGitHubYearRange(year);
-        return `year_${year}: contributionsCollection(from: "${toGitHubDateTime(from)}", to: "${toGitHubDateTime(to)}") { ...YearContributions }`;
-    })
-        .join('\n');
-    // fragment must match queries/stats.graphql, which generates its type
-    return graphqlDocument(`
+const buildContributionsDocument = (ranges) => 
+// fragment must match queries/stats.graphql, which generates its type
+graphqlDocument(`
 query userContributions($login: String!) {
   user(login: $login) {
-    ${yearFields}
+    ${aliasedRanges(ranges, 'RangeContributions')}
   }
 }
-fragment YearContributions on ContributionsCollection {
+fragment RangeContributions on ContributionsCollection {
+  totalCommitContributions
   contributionCalendar {
     totalContributions
   }
 }`);
-};
 export { buildContributionsDocument };

package/build/graphql/generated/contributed-to.d.ts

@@ -0,0 +1,22 @@
+/** Internal type. DO NOT USE DIRECTLY. */
+type Exact<T extends {
+    [key: string]: unknown;
+}> = {
+    [K in keyof T]: T[K];
+};
+export type UserContributionYearsQueryVariables = Exact<{
+    login: string;
+}>;
+export type UserContributionYearsQuery = {
+    user: {
+        login: string;
+        contributionsCollection: {
+            contributionYears: Array<number>;
+        };
+    } | null;
+};
+export declare const UserContributionYearsDocument: import("../graphqlDocument.ts").GraphQLDocument<UserContributionYearsQuery, Exact<{
+    login: string;
+}>>;
+export {};
+//# sourceMappingURL=contributed-to.d.ts.map

package/build/graphql/generated/contributed-to.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contributed-to.d.ts","sourceRoot":"","sources":["../../../src/graphql/generated/contributed-to.ts"],"names":[],"mappings":"AAEA,0CAA0C;AAC1C,KAAK,KAAK,CAAC,CAAC,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE5E,MAAM,MAAM,mCAAmC,GAAG,KAAK,CAAC;IACtD,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,uBAAuB,EAAE;YAAE,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;SAAE,CAAA;KAAE,GAAG,IAAI,CAAC;CAC/F,CAAC;AAEF,eAAO,MAAM,6BAA6B;WAPjC,MAAM;GAkBZ,CAAC"}

package/build/graphql/generated/contributed-to.js

@@ -0,0 +1,11 @@
+// Generated file — see .github/CONTRIBUTING.md
+import { graphqlDocument } from '../graphqlDocument.js';
+export const UserContributionYearsDocument = graphqlDocument(`
+query userContributionYears($login: String!) {
+  user(login: $login) {
+    login
+    contributionsCollection {
+      contributionYears
+    }
+  }
+}`);

package/build/graphql/generated/gist.d.ts

@@ -37,7 +37,7 @@ export type GistInfoQuery = {
         } | null;
     };
 };
-export declare const GistInfoDocument: import("../graphqlDocument.js").GraphQLDocument<GistInfoQuery, Exact<{
+export declare const GistInfoDocument: import("../graphqlDocument.ts").GraphQLDocument<GistInfoQuery, Exact<{
     gistName: string;
 }>>;
 export {};

package/build/graphql/generated/repo.d.ts

@@ -59,7 +59,7 @@ export type GetRepoQuery = {
         } | null;
     } | null;
 };
-export declare const GetRepoDocument: import("../graphqlDocument.js").GraphQLDocument<GetRepoQuery, Exact<{
+export declare const GetRepoDocument: import("../graphqlDocument.ts").GraphQLDocument<GetRepoQuery, Exact<{
     login: string;
     repo: string;
 }>>;

package/build/graphql/generated/stats.d.ts

@@ -4,7 +4,7 @@ type Exact<T extends {
 }> = {
     [K in keyof T]: T[K];
 };
-import type * as Types from './common.js';
+import type * as Types from './common.ts';
 export type RepoNodeFragment = {
     name: string;
     stargazerCount: number;
@@ -49,6 +49,7 @@ export type UserInfoQueryVariables = Exact<{
     includeDiscussions: boolean;
     includeDiscussionsAnswers: boolean;
     startTime?: string | null | undefined;
+    endTime?: string | null | undefined;
     ownerAffiliations?: Array<Types.RepositoryAffiliation | null | undefined> | Types.RepositoryAffiliation | null | undefined;
     includeUserRepositories: boolean;
 }>;
@@ -102,7 +103,8 @@ export type UserInfoQuery = {
         };
     } | null;
 };
-export type YearContributionsFragment = {
+export type RangeContributionsFragment = {
+    totalCommitContributions: number;
     contributionCalendar: {
         totalContributions: number;
     };
@@ -112,16 +114,25 @@ export type RangeContributionsByRepoFragment = {
         repository: {
             nameWithOwner: string;
         };
+        contributions: {
+            totalCount: number;
+        };
     }>;
     issueContributionsByRepository: Array<{
         repository: {
             nameWithOwner: string;
         };
+        contributions: {
+            totalCount: number;
+        };
     }>;
     pullRequestContributionsByRepository: Array<{
         repository: {
             nameWithOwner: string;
         };
+        contributions: {
+            totalCount: number;
+        };
     }>;
     repositoryContributions?: {
         nodes: Array<{
@@ -131,18 +142,19 @@ export type RangeContributionsByRepoFragment = {
         } | null> | null;
     };
 };
-export declare const UserReposDocument: import("../graphqlDocument.js").GraphQLDocument<UserReposQuery, Exact<{
+export declare const UserReposDocument: import("../graphqlDocument.ts").GraphQLDocument<UserReposQuery, Exact<{
     login: string;
     after?: string | null | undefined;
     ownerAffiliations?: Array<Types.RepositoryAffiliation | null | undefined> | Types.RepositoryAffiliation | null | undefined;
 }>>;
-export declare const UserInfoDocument: import("../graphqlDocument.js").GraphQLDocument<UserInfoQuery, Exact<{
+export declare const UserInfoDocument: import("../graphqlDocument.ts").GraphQLDocument<UserInfoQuery, Exact<{
     login: string;
     after?: string | null | undefined;
     includeMergedPullRequests: boolean;
     includeDiscussions: boolean;
     includeDiscussionsAnswers: boolean;
     startTime?: string | null | undefined;
+    endTime?: string | null | undefined;
     ownerAffiliations?: Array<Types.RepositoryAffiliation | null | undefined> | Types.RepositoryAffiliation | null | undefined;
     includeUserRepositories: boolean;
 }>>;

package/build/graphql/generated/stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/graphql/generated/stats.ts"],"names":[],"mappings":"AAEA,0CAA0C;AAC1C,KAAK,KAAK,CAAC,CAAC,SAAS;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAG5E,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAC;AAC1C,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;QACrE,QAAQ,EAAE;YAAE,WAAW,EAAE,OAAO,CAAC;YAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,CAAC;KAC9D,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,KAAK,CAAC;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,iBAAiB,CAAC,EACd,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC,GACrD,KAAK,CAAC,qBAAqB,GAC3B,IAAI,GACJ,SAAS,CAAC;CACf,CAAC,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,UAAU,EAAE,MAAM,CAAC;YACnB,KAAK,EAAE,KAAK,CAAC;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,cAAc,EAAE,MAAM,CAAA;aAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;YACrE,QAAQ,EAAE;gBAAE,WAAW,EAAE,OAAO,CAAC;gBAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;aAAE,CAAC;SAC9D,CAAC;KACH,GAAG,IAAI,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,KAAK,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;IACnC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,yBAAyB,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACtC,iBAAiB,CAAC,EACd,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC,GACrD,KAAK,CAAC,qBAAqB,GAC3B,IAAI,GACJ,SAAS,CAAC;IACd,uBAAuB,EAAE,OAAO,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YAAE,wBAAwB,EAAE,MAAM,CAAA;SAAE,CAAC;QAC9C,OAAO,EAAE;YAAE,mCAAmC,EAAE,MAAM,CAAA;SAAE,CAAC;QACzD,yBAAyB,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QAClD,YAAY,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,kBAAkB,CAAC,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5C,UAAU,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QACnC,YAAY,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,SAAS,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,qBAAqB,CAAC,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QAC/C,4BAA4B,CAAC,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QACtD,uBAAuB,EAAE;YAAE,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;SAAE,CAAC;QAC9D,YAAY,EAAE;YACZ,UAAU,EAAE,MAAM,CAAC;YACnB,KAAK,EAAE,KAAK,CAAC;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,cAAc,EAAE,MAAM,CAAA;aAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;YACrE,QAAQ,EAAE;gBAAE,WAAW,EAAE,OAAO,CAAC;gBAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;aAAE,CAAC;SAC9D,CAAC;KACH,GAAG,IAAI,CAAC;CACV,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,oBAAoB,EAAE;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEjG,MAAM,MAAM,gCAAgC,GAAG;IAC7C,+BAA+B,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAClF,8BAA8B,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACjF,oCAAoC,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACvF,uBAAuB,CAAC,EAAE;QACxB,KAAK,EAAE,KAAK,CAAC;YAAE,UAAU,EAAE;gBAAE,aAAa,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;KACvE,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,iBAAiB;WApErB,MAAM;YACL,MAAM,GAAG,IAAI,GAAG,SAAS;wBAE7B,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC,GACrD,KAAK,CAAC,qBAAqB,GAC3B,IAAI,GACJ,SAAS;GAwFZ,CAAC;AAEJ,eAAO,MAAM,gBAAgB;WA5EpB,MAAM;YACL,MAAM,GAAG,IAAI,GAAG,SAAS;+BACN,OAAO;wBACd,OAAO;+BACA,OAAO;gBACtB,MAAM,GAAG,IAAI,GAAG,SAAS;wBAEjC,KAAK,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,GAAG,SAAS,CAAC,GACrD,KAAK,CAAC,qBAAqB,GAC3B,IAAI,GACJ,SAAS;6BACY,OAAO;GAkI/B,CAAC"}
+{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../src/graphql/generated/stats.ts"],"names":[],"mappings":"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"}

package/build/graphql/generated/stats.js

@@ -28,11 +28,11 @@ fragment RepoNode on Repository {
   stargazerCount
 }`);
 export const UserInfoDocument = graphqlDocument(`
-query userInfo($login: String!, $after: String, $includeMergedPullRequests: Boolean!, $includeDiscussions: Boolean!, $includeDiscussionsAnswers: Boolean!, $startTime: DateTime = null, $ownerAffiliations: [RepositoryAffiliation], $includeUserRepositories: Boolean!) {
+query userInfo($login: String!, $after: String, $includeMergedPullRequests: Boolean!, $includeDiscussions: Boolean!, $includeDiscussionsAnswers: Boolean!, $startTime: DateTime = null, $endTime: DateTime = null, $ownerAffiliations: [RepositoryAffiliation], $includeUserRepositories: Boolean!) {
   user(login: $login) {
     name
     login
-    commits: contributionsCollection(from: $startTime) {
+    commits: contributionsCollection(from: $startTime, to: $endTime) {
       totalCommitContributions
     }
     reviews: contributionsCollection {

package/build/graphql/generated/top-languages.d.ts

@@ -4,7 +4,7 @@ type Exact<T extends {
 }> = {
     [K in keyof T]: T[K];
 };
-import type * as Types from './common.js';
+import type * as Types from './common.ts';
 export type TopLanguageFragment = {
     size: number;
     node: {
@@ -46,7 +46,7 @@ export type TopLanguagesQuery = {
         };
     } | null;
 };
-export declare const TopLanguagesDocument: import("../graphqlDocument.js").GraphQLDocument<TopLanguagesQuery, Exact<{
+export declare const TopLanguagesDocument: import("../graphqlDocument.ts").GraphQLDocument<TopLanguagesQuery, Exact<{
     login: string;
     ownerAffiliations?: Array<Types.RepositoryAffiliation | null | undefined> | Types.RepositoryAffiliation | null | undefined;
 }>>;

package/build/graphql/graphqlDocument.d.ts

@@ -3,7 +3,7 @@
  *
  * `text` is what goes over the wire; the other two members only carry types and are never assigned.
  * Documents are generated from `queries/*.graphql`
- * See `scripts/generate-graphql-types.js`.
+ * See `scripts/generate-graphql-types.ts`.
  */
 interface GraphQLDocument<TResult, TVariables> {
     readonly text: string;
@@ -13,7 +13,6 @@ interface GraphQLDocument<TResult, TVariables> {
 /**
  * Build a typed document.
  *
- * @param text The query text, including every fragment it spreads.
  * @returns The document to pass to the function created by `createGraphQLFetcher`.
  */
 declare const graphqlDocument: <TResult, TVariables>(text: string) => GraphQLDocument<TResult, TVariables>;

package/build/graphql/graphqlDocument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/graphqlDocument.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,UAAU,eAAe,CAAC,OAAO,EAAE,UAAU;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CACnC;AAED;;;;;GAKG;AACH,QAAA,MAAM,eAAe,GAAI,OAAO,EAAE,UAAU,EAC1C,MAAM,MAAM,KACX,eAAe,CAAC,OAAO,EAAE,UAAU,CAAe,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,YAAY,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"graphqlDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/graphqlDocument.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,UAAU,eAAe,CAAC,OAAO,EAAE,UAAU;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CACnC;AAED;;;;GAIG;AACH,QAAA,MAAM,eAAe,GAAI,OAAO,EAAE,UAAU,QACpC,MAAM,KACX,eAAe,CAAC,OAAO,EAAE,UAAU,CAAe,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,YAAY,EAAE,eAAe,EAAE,CAAC"}

package/build/graphql/graphqlDocument.js

@@ -1,7 +1,6 @@
 /**
  * Build a typed document.
  *
- * @param text The query text, including every fragment it spreads.
  * @returns The document to pass to the function created by `createGraphQLFetcher`.
  */
 const graphqlDocument = (text) => ({ text });

package/build/graphql/reposContributedToDocument.d.ts

@@ -1,5 +1,6 @@
-import type { GitHubDateRange } from '../common/date.js';
-import type { RangeContributionsByRepoFragment } from './generated/stats.js';
+import type { GitHubDateRange } from '../common/date.ts';
+import type { RangeContributionsByRepoFragment } from './generated/stats.ts';
+import type { GraphQLDocument } from './graphqlDocument.ts';
 /** max value GitHub allows for `first/maxRepositories` */
 declare const MAX_REPOSITORIES_LIMIT = 100;
 interface ReposContributedToQueryVariables {
@@ -17,11 +18,9 @@ interface ReposContributedToQuery {
  * Mirrors the `contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]`
  * filter used by `repositoriesContributedTo` in `stats.graphql`.
  *
- * @param ranges Ranges to fetch, one `range_<index>` alias each.
- * @param includeOwnRepos Whether to select `repositoryContributions`.
  * @returns Document for `createGraphQLFetcher`.
  */
-declare const buildReposContributedToDocument: (ranges: Array<GitHubDateRange>, includeOwnRepos: boolean) => import("./graphqlDocument.js").GraphQLDocument<ReposContributedToQuery, ReposContributedToQueryVariables>;
+declare const buildReposContributedToDocument: (ranges: Array<GitHubDateRange>, includeOwnRepos: boolean) => GraphQLDocument<ReposContributedToQuery, ReposContributedToQueryVariables>;
 export { buildReposContributedToDocument, MAX_REPOSITORIES_LIMIT };
 export type { ReposContributedToQuery };
 //# sourceMappingURL=reposContributedToDocument.d.ts.map

package/build/graphql/reposContributedToDocument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reposContributedToDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/reposContributedToDocument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AAG7E,0DAA0D;AAC1D,QAAA,MAAM,sBAAsB,MAAM,CAAC;AAEnC,UAAU,gCAAgC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,gCAAgC,CAAC,GAAG,IAAI,CAAC;CAC1E;AAED;;;;;;;;;;;GAWG;AACH,QAAA,MAAM,+BAA+B,GACnC,QAAQ,KAAK,CAAC,eAAe,CAAC,EAC9B,iBAAiB,OAAO,8GA+CzB,CAAC;AAEF,OAAO,EAAE,+BAA+B,EAAE,sBAAsB,EAAE,CAAC;AACnE,YAAY,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"reposContributedToDocument.d.ts","sourceRoot":"","sources":["../../src/graphql/reposContributedToDocument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,0DAA0D;AAC1D,QAAA,MAAM,sBAAsB,MAAM,CAAC;AAEnC,UAAU,gCAAgC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,EAAE,EAAE,gCAAgC,CAAC,GAAG,IAAI,CAAC;CAC1E;AAED;;;;;;;;;GASG;AACH,QAAA,MAAM,+BAA+B,WAC3B,KAAK,CAAC,eAAe,CAAC,mBACb,OAAO,KACvB,eAAe,CAAC,uBAAuB,EAAE,gCAAgC,CAgD3E,CAAC;AAEF,OAAO,EAAE,+BAA+B,EAAE,sBAAsB,EAAE,CAAC;AACnE,YAAY,EAAE,uBAAuB,EAAE,CAAC"}

package/build/graphql/reposContributedToDocument.js

@@ -1,4 +1,4 @@
-import { toGitHubDateTime } from '../common/date.js';
+import { aliasedRanges } from './contributionsCollection.js';
 import { graphqlDocument } from './graphqlDocument.js';
 /** max value GitHub allows for `first/maxRepositories` */
 const MAX_REPOSITORIES_LIMIT = 100;
@@ -10,14 +10,9 @@ const MAX_REPOSITORIES_LIMIT = 100;
  * Mirrors the `contributionTypes: [COMMIT, ISSUE, PULL_REQUEST, REPOSITORY]`
  * filter used by `repositoriesContributedTo` in `stats.graphql`.
  *
- * @param ranges Ranges to fetch, one `range_<index>` alias each.
- * @param includeOwnRepos Whether to select `repositoryContributions`.
  * @returns Document for `createGraphQLFetcher`.
  */
 const buildReposContributedToDocument = (ranges, includeOwnRepos) => {
-    const rangeFields = ranges
-        .map(({ from, to }, index) => `range_${index}: contributionsCollection(from: "${toGitHubDateTime(from)}", to: "${toGitHubDateTime(to)}") { ...RangeContributionsByRepo }`)
-        .join('\n');
     // `repositoryContributions` only ever returns repos the user owns,
     // so it is left out rather than gated with @include: an excluded field still counts toward the query's node cost.
     // stats.graphql carries the directive so the generated type marks the field optional.
@@ -34,7 +29,7 @@ const buildReposContributedToDocument = (ranges, includeOwnRepos) => {
     return graphqlDocument(`
 query userReposContributedTo($login: String!, $maxRepositories: Int!) {
   user(login: $login) {
-    ${rangeFields}
+    ${aliasedRanges(ranges, 'RangeContributionsByRepo')}
   }
 }
 fragment RangeContributionsByRepo on ContributionsCollection {
@@ -42,16 +37,25 @@ fragment RangeContributionsByRepo on ContributionsCollection {
     repository {
       nameWithOwner
     }
+    contributions {
+      totalCount
+    }
   }
   issueContributionsByRepository(maxRepositories: $maxRepositories) {
     repository {
       nameWithOwner
     }
+    contributions {
+      totalCount
+    }
   }
   pullRequestContributionsByRepository(maxRepositories: $maxRepositories) {
     repository {
       nameWithOwner
     }
+    contributions {
+      totalCount
+    }
   }
   ${ownRepoField}
 }`);