@stats-forge/github-stats-forge-core 0.0.2 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -10
- package/build/api/api-result.d.ts +6 -7
- package/build/api/api-result.d.ts.map +1 -1
- package/build/api/api-result.js +4 -5
- package/build/api/contributed-to.d.ts +23 -0
- package/build/api/contributed-to.d.ts.map +1 -0
- package/build/api/contributed-to.js +43 -0
- package/build/api/gist.d.ts +8 -22
- package/build/api/gist.d.ts.map +1 -1
- package/build/api/gist.js +14 -36
- package/build/api/handler.d.ts +16 -0
- package/build/api/handler.d.ts.map +1 -0
- package/build/api/handler.js +29 -0
- package/build/api/index.d.ts +13 -12
- package/build/api/index.d.ts.map +1 -1
- package/build/api/index.js +1 -0
- package/build/api/params.d.ts +21 -12
- package/build/api/params.d.ts.map +1 -1
- package/build/api/params.js +41 -19
- package/build/api/pin.d.ts +11 -31
- package/build/api/pin.d.ts.map +1 -1
- package/build/api/pin.js +35 -63
- package/build/api/stats.d.ts +15 -16
- package/build/api/stats.d.ts.map +1 -1
- package/build/api/stats.js +60 -99
- package/build/api/top-langs.d.ts +13 -18
- package/build/api/top-langs.d.ts.map +1 -1
- package/build/api/top-langs.js +35 -72
- package/build/api/wakatime.d.ts +11 -17
- package/build/api/wakatime.d.ts.map +1 -1
- package/build/api/wakatime.js +27 -64
- package/build/calculateRank.d.ts +0 -9
- package/build/calculateRank.d.ts.map +1 -1
- package/build/calculateRank.js +12 -17
- package/build/cards/contributed-to.d.ts +19 -0
- package/build/cards/contributed-to.d.ts.map +1 -0
- package/build/cards/contributed-to.js +242 -0
- package/build/cards/gist.d.ts +3 -4
- package/build/cards/gist.d.ts.map +1 -1
- package/build/cards/gist.js +38 -43
- package/build/cards/options.d.ts +1 -1
- package/build/cards/repo.d.ts +14 -5
- package/build/cards/repo.d.ts.map +1 -1
- package/build/cards/repo.js +93 -103
- package/build/cards/stats.d.ts +18 -11
- package/build/cards/stats.d.ts.map +1 -1
- package/build/cards/stats.js +191 -222
- package/build/cards/top-languages.d.ts +18 -33
- package/build/cards/top-languages.d.ts.map +1 -1
- package/build/cards/top-languages.js +196 -387
- package/build/cards/wakatime.d.ts +17 -8
- package/build/cards/wakatime.d.ts.map +1 -1
- package/build/cards/wakatime.js +133 -187
- package/build/common/Card.d.ts +20 -59
- package/build/common/Card.d.ts.map +1 -1
- package/build/common/Card.js +131 -198
- package/build/common/I18n.d.ts +1 -7
- package/build/common/I18n.d.ts.map +1 -1
- package/build/common/I18n.js +7 -8
- package/build/common/brand.d.ts +76 -0
- package/build/common/brand.d.ts.map +1 -0
- package/build/common/brand.js +73 -0
- package/build/common/color.d.ts +4 -17
- package/build/common/color.d.ts.map +1 -1
- package/build/common/color.js +67 -49
- package/build/common/config.d.ts +4 -14
- package/build/common/config.d.ts.map +1 -1
- package/build/common/config.js +3 -16
- package/build/common/constants.d.ts +6 -2
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +5 -1
- package/build/common/date.d.ts +50 -5
- package/build/common/date.d.ts.map +1 -1
- package/build/common/date.js +104 -4
- package/build/common/emojiMap.d.ts +8 -0
- package/build/common/emojiMap.d.ts.map +1 -0
- package/build/common/emojiMap.js +10 -0
- package/build/common/emojiMap.json +1915 -0
- package/build/common/error.d.ts +1 -10
- package/build/common/error.d.ts.map +1 -1
- package/build/common/error.js +1 -10
- package/build/common/fmt.d.ts +3 -15
- package/build/common/fmt.d.ts.map +1 -1
- package/build/common/fmt.js +7 -35
- package/build/common/http.d.ts +2 -7
- package/build/common/http.d.ts.map +1 -1
- package/build/common/http.js +8 -17
- package/build/common/icons.d.ts +20 -20
- package/build/common/icons.d.ts.map +1 -1
- package/build/common/icons.js +108 -67
- package/build/common/languageColors.d.ts +0 -1
- package/build/common/languageColors.d.ts.map +1 -1
- package/build/common/languageColors.js +1 -4
- package/build/common/languageColors.json +18 -2
- package/build/common/ops.d.ts +11 -17
- package/build/common/ops.d.ts.map +1 -1
- package/build/common/ops.js +22 -39
- package/build/common/render.d.ts +34 -82
- package/build/common/render.d.ts.map +1 -1
- package/build/common/render.js +225 -259
- package/build/common/retryer.d.ts +2 -7
- package/build/common/retryer.d.ts.map +1 -1
- package/build/common/retryer.js +4 -11
- package/build/fetchers/contributed-to.d.ts +62 -0
- package/build/fetchers/contributed-to.d.ts.map +1 -0
- package/build/fetchers/contributed-to.js +184 -0
- package/build/fetchers/gist.d.ts +2 -5
- package/build/fetchers/gist.d.ts.map +1 -1
- package/build/fetchers/gist.js +1 -5
- package/build/fetchers/graphql-error.d.ts +13 -0
- package/build/fetchers/graphql-error.d.ts.map +1 -0
- package/build/fetchers/graphql-error.js +29 -0
- package/build/fetchers/index.d.ts +13 -12
- package/build/fetchers/index.d.ts.map +1 -1
- package/build/fetchers/index.js +1 -0
- package/build/fetchers/repo.d.ts +2 -11
- package/build/fetchers/repo.d.ts.map +1 -1
- package/build/fetchers/repo.js +20 -33
- package/build/fetchers/stats.d.ts +16 -40
- package/build/fetchers/stats.d.ts.map +1 -1
- package/build/fetchers/stats.js +89 -271
- package/build/fetchers/top-languages.d.ts +2 -9
- package/build/fetchers/top-languages.d.ts.map +1 -1
- package/build/fetchers/top-languages.js +16 -47
- package/build/fetchers/types.d.ts +25 -1
- package/build/fetchers/types.d.ts.map +1 -1
- package/build/fetchers/wakatime.d.ts +2 -6
- package/build/fetchers/wakatime.d.ts.map +1 -1
- package/build/fetchers/wakatime.js +1 -5
- package/build/graphql/contributionsCollection.d.ts +9 -0
- package/build/graphql/contributionsCollection.d.ts.map +1 -0
- package/build/graphql/contributionsCollection.js +12 -0
- package/build/graphql/contributionsDocument.d.ts +6 -6
- package/build/graphql/contributionsDocument.d.ts.map +1 -1
- package/build/graphql/contributionsDocument.js +8 -16
- package/build/graphql/generated/contributed-to.d.ts +22 -0
- package/build/graphql/generated/contributed-to.d.ts.map +1 -0
- package/build/graphql/generated/contributed-to.js +11 -0
- package/build/graphql/generated/gist.d.ts +1 -1
- package/build/graphql/generated/repo.d.ts +1 -1
- package/build/graphql/generated/stats.d.ts +16 -4
- package/build/graphql/generated/stats.d.ts.map +1 -1
- package/build/graphql/generated/stats.js +2 -2
- package/build/graphql/generated/top-languages.d.ts +2 -2
- package/build/graphql/graphqlDocument.d.ts +1 -2
- package/build/graphql/graphqlDocument.d.ts.map +1 -1
- package/build/graphql/graphqlDocument.js +0 -1
- package/build/graphql/reposContributedToDocument.d.ts +4 -5
- package/build/graphql/reposContributedToDocument.d.ts.map +1 -1
- package/build/graphql/reposContributedToDocument.js +11 -7
- package/build/markup/css.d.ts +35 -0
- package/build/markup/css.d.ts.map +1 -0
- package/build/markup/css.js +64 -0
- package/build/markup/element.d.ts +41 -0
- package/build/markup/element.d.ts.map +1 -0
- package/build/markup/element.js +127 -0
- package/build/markup/html.d.ts +13 -0
- package/build/markup/html.d.ts.map +1 -0
- package/build/markup/html.js +27 -0
- package/build/markup/index.d.ts +9 -0
- package/build/markup/index.d.ts.map +1 -0
- package/build/markup/index.js +6 -0
- package/build/markup/serialize.d.ts +16 -0
- package/build/markup/serialize.d.ts.map +1 -0
- package/build/markup/serialize.js +17 -0
- package/build/themes/index.d.ts +332 -333
- package/build/themes/index.d.ts.map +1 -1
- package/build/themes/index.js +1 -1
- package/build/translations.d.ts +66 -7
- package/build/translations.d.ts.map +1 -1
- package/build/translations.js +686 -629
- package/package.json +17 -26
- package/src/api/api-result.ts +10 -9
- package/src/api/contributed-to.ts +84 -0
- package/src/api/gist.ts +22 -46
- package/src/api/handler.ts +42 -0
- package/src/api/index.ts +13 -12
- package/src/api/params.ts +74 -29
- package/src/api/pin.ts +38 -65
- package/src/api/stats.ts +81 -118
- package/src/api/top-langs.ts +38 -80
- package/src/api/wakatime.ts +35 -73
- package/src/calculateRank.ts +12 -23
- package/src/cards/contributed-to.ts +373 -0
- package/src/cards/gist.ts +55 -49
- package/src/cards/options.ts +1 -1
- package/src/cards/repo.ts +134 -120
- package/src/cards/stats.ts +262 -252
- package/src/cards/top-languages.ts +315 -422
- package/src/cards/wakatime.ts +207 -225
- package/src/common/Card.ts +207 -214
- package/src/common/I18n.ts +7 -8
- package/src/common/brand.ts +109 -0
- package/src/common/color.ts +80 -57
- package/src/common/config.ts +5 -18
- package/src/common/constants.ts +8 -2
- package/src/common/date.ts +135 -5
- package/src/common/emojiMap.json +1915 -0
- package/src/common/emojiMap.ts +13 -0
- package/src/common/error.ts +2 -11
- package/src/common/fmt.ts +7 -44
- package/src/common/http.ts +9 -15
- package/src/common/icons.ts +122 -42
- package/src/common/languageColors.json +18 -2
- package/src/common/languageColors.ts +1 -4
- package/src/common/ops.ts +31 -48
- package/src/common/render.ts +334 -284
- package/src/common/retryer.ts +8 -15
- package/src/fetchers/contributed-to.ts +271 -0
- package/src/fetchers/gist.ts +8 -12
- package/src/fetchers/graphql-error.ts +36 -0
- package/src/fetchers/index.ts +15 -12
- package/src/fetchers/repo.ts +27 -40
- package/src/fetchers/stats.ts +157 -366
- package/src/fetchers/top-languages.ts +27 -55
- package/src/fetchers/types.ts +27 -1
- package/src/fetchers/wakatime.ts +5 -9
- package/src/graphql/contributionsCollection.ts +18 -0
- package/src/graphql/contributionsDocument.ts +14 -19
- package/src/graphql/generated/contributed-to.ts +25 -0
- package/src/graphql/generated/gist.ts +1 -1
- package/src/graphql/generated/repo.ts +1 -1
- package/src/graphql/generated/stats.ts +21 -8
- package/src/graphql/generated/top-languages.ts +2 -2
- package/src/graphql/graphqlDocument.ts +1 -2
- package/src/graphql/queries/contributed-to.graphql +8 -0
- package/src/graphql/queries/stats.graphql +14 -2
- package/src/graphql/reposContributedToDocument.ts +16 -15
- package/src/markup/css.ts +118 -0
- package/src/markup/element.ts +246 -0
- package/src/markup/html.ts +34 -0
- package/src/markup/index.ts +9 -0
- package/src/markup/serialize.ts +27 -0
- package/src/themes/index.ts +1 -1
- package/src/translations.ts +699 -629
- package/build/cards/index.d.ts +0 -11
- package/build/cards/index.d.ts.map +0 -1
- package/build/cards/index.js +0 -7
- package/build/common/html.d.ts +0 -8
- package/build/common/html.d.ts.map +0 -1
- package/build/common/html.js +0 -14
- package/build/index.d.ts +0 -15
- package/build/index.d.ts.map +0 -1
- package/build/index.js +0 -10
- package/src/_emoji-name-map.d.ts +0 -10
- package/src/_github-username-regex.d.ts +0 -4
- package/src/cards/index.ts +0 -21
- package/src/common/html.ts +0 -17
- package/src/index.ts +0 -18
package/build/api/pin.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
2
|
import { renderRepoCard } from '../cards/repo.js';
|
|
3
3
|
import { fetchRepo } from '../fetchers/repo.js';
|
|
4
|
-
import {
|
|
5
|
-
import { booleanParam, listParam, localeParam, looseIntParam, numberParam,
|
|
4
|
+
import { cardHandler } from './handler.js';
|
|
5
|
+
import { booleanParam, listParam, localeParam, looseIntParam, numberParam, rawParam, safeParam, usernameParam, } from './params.js';
|
|
6
6
|
/** What the pin endpoint accepts, on top of the shared color params. */
|
|
7
7
|
const pinQuery = z.object({
|
|
8
|
-
username:
|
|
8
|
+
username: usernameParam,
|
|
9
9
|
repo: safeParam,
|
|
10
10
|
hide_border: booleanParam,
|
|
11
11
|
card_width: looseIntParam,
|
|
@@ -23,65 +23,37 @@ const pinQuery = z.object({
|
|
|
23
23
|
/**
|
|
24
24
|
* Render the repository card for a set of query params.
|
|
25
25
|
*
|
|
26
|
-
* @param query Raw query params, plus any of the shared color params.
|
|
27
|
-
* @param query.username GitHub username the repository belongs to.
|
|
28
|
-
* @param query.repo Repository name.
|
|
29
|
-
* @param query.hide_border Whether to hide the card border.
|
|
30
|
-
* @param query.card_width Card width.
|
|
31
|
-
* @param query.show_owner Whether to show the repository owner.
|
|
32
|
-
* @param query.browser_rendering Whether the browser wraps the description text.
|
|
33
|
-
* @param query.show Comma-separated extra stats to show.
|
|
34
|
-
* @param query.show_icons Whether to show the stat icons.
|
|
35
|
-
* @param query.number_format How numbers are abbreviated.
|
|
36
|
-
* @param query.text_bold Whether the stat values are bold.
|
|
37
|
-
* @param query.line_height Line height between the stats.
|
|
38
|
-
* @param query.locale Language the card is rendered in.
|
|
39
|
-
* @param query.border_radius Card border radius.
|
|
40
|
-
* @param query.description_lines_count Lines the description is wrapped to.
|
|
41
|
-
* @param config Deployment config supplying the PAT pool.
|
|
42
26
|
* @returns The rendered card, or a rendered error.
|
|
43
27
|
*/
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
text_bold,
|
|
77
|
-
line_height,
|
|
78
|
-
username,
|
|
79
|
-
locale,
|
|
80
|
-
description_lines_count,
|
|
81
|
-
}),
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
|
-
catch (err) {
|
|
85
|
-
return errorResult(err, colors);
|
|
86
|
-
}
|
|
87
|
-
};
|
|
28
|
+
const renderPin = cardHandler(pinQuery, async ({ username, repo, hide_border, card_width, show_owner, browser_rendering, show, show_icons, number_format, text_bold, line_height, locale, border_radius, description_lines_count, }, colors, config) => {
|
|
29
|
+
const repoData = await fetchRepo({
|
|
30
|
+
username,
|
|
31
|
+
reponame: repo,
|
|
32
|
+
include_prs_authored: show.includes('prs_authored'),
|
|
33
|
+
include_prs_commented: show.includes('prs_commented'),
|
|
34
|
+
include_prs_reviewed: show.includes('prs_reviewed'),
|
|
35
|
+
include_issues_authored: show.includes('issues_authored'),
|
|
36
|
+
include_issues_commented: show.includes('issues_commented'),
|
|
37
|
+
}, config);
|
|
38
|
+
return renderRepoCard(repoData, {
|
|
39
|
+
...colors,
|
|
40
|
+
hide_border,
|
|
41
|
+
border_radius,
|
|
42
|
+
card_width_input: card_width,
|
|
43
|
+
show_owner,
|
|
44
|
+
browser_rendering,
|
|
45
|
+
show,
|
|
46
|
+
show_icons,
|
|
47
|
+
number_format,
|
|
48
|
+
text_bold,
|
|
49
|
+
line_height,
|
|
50
|
+
username,
|
|
51
|
+
locale,
|
|
52
|
+
description_lines_count,
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
/**
|
|
56
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
57
|
+
* A UI reads them off the function it calls: `pin.OPTIONS.show`.
|
|
58
|
+
*/
|
|
59
|
+
export const pin = Object.assign(renderPin, { OPTIONS: renderRepoCard.OPTIONS });
|
package/build/api/stats.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
declare const
|
|
2
|
+
/**
|
|
3
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
4
|
+
* A UI reads them off the function it calls: `stats.OPTIONS.rank_icon`.
|
|
5
|
+
*/
|
|
6
|
+
export declare const stats: ((query: import("./params.ts").ApiQuery<z.ZodMiniObject<{
|
|
7
7
|
username: z.ZodMiniType<string | undefined, string | undefined, z.core.$ZodTypeInternals<string | undefined, string | undefined>>;
|
|
8
8
|
repo: z.ZodMiniType<string[], string | undefined, z.core.$ZodTypeInternals<string[], string | undefined>>;
|
|
9
9
|
owner: z.ZodMiniType<string[], string | undefined, z.core.$ZodTypeInternals<string[], string | undefined>>;
|
|
@@ -14,7 +14,8 @@ declare const statsQuery: z.ZodMiniObject<{
|
|
|
14
14
|
hide_rank: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
15
15
|
show_icons: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
16
16
|
include_all_commits: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
17
|
-
|
|
17
|
+
from: z.ZodMiniType<Date | undefined, string | undefined, z.core.$ZodTypeInternals<Date | undefined, string | undefined>>;
|
|
18
|
+
to: z.ZodMiniType<Date | undefined, string | undefined, z.core.$ZodTypeInternals<Date | undefined, string | undefined>>;
|
|
18
19
|
line_height: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
19
20
|
text_bold: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
20
21
|
exclude_repo: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<string[], string | undefined>>;
|
|
@@ -28,15 +29,13 @@ declare const statsQuery: z.ZodMiniObject<{
|
|
|
28
29
|
rank_icon: z.ZodMiniType<"default" | "github" | "percentile" | undefined, string | undefined, z.core.$ZodTypeInternals<"default" | "github" | "percentile" | undefined, string | undefined>>;
|
|
29
30
|
show: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<string[], string | undefined>>;
|
|
30
31
|
contribs_include_own_repos: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
31
|
-
}, z.core.$strip
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
RANK_ICONS: readonly ["default", "github", "percentile"];
|
|
32
|
+
}, z.core.$strip>>, config: import("./index.ts").CardConfig) => Promise<import("./api-result.ts").ApiResult>) & {
|
|
33
|
+
OPTIONS: {
|
|
34
|
+
rank_icon: readonly ["default", "github", "percentile"];
|
|
35
|
+
show: readonly ["contributions", "prs_merged", "prs_merged_percentage", "reviews", "discussions_started", "discussions_answered", "prs_authored", "prs_commented", "prs_reviewed", "issues_authored", "issues_commented", "all_time_contribs"];
|
|
36
|
+
hide: readonly ["stars", "commits", "prs", "issues", "contribs"];
|
|
37
|
+
number_format: readonly ["short", "long"];
|
|
38
|
+
role: import("../graphql/generated/common.ts").RepositoryAffiliation[];
|
|
39
|
+
};
|
|
40
40
|
};
|
|
41
|
-
export {};
|
|
42
41
|
//# sourceMappingURL=stats.d.ts.map
|
package/build/api/stats.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../src/api/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../src/api/stats.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAuJ9B;;;GAGG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEhB,CAAC"}
|
package/build/api/stats.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
|
-
import {
|
|
2
|
+
import { renderStatsCard } from '../cards/stats.js';
|
|
3
|
+
import { OWNER_AFFILIATIONS } from '../common/constants.js';
|
|
3
4
|
import { fetchStats } from '../fetchers/stats.js';
|
|
4
|
-
import {
|
|
5
|
-
import { booleanParam, enumParam, listParam, localeParam, looseIntParam, numberParam,
|
|
5
|
+
import { cardHandler } from './handler.js';
|
|
6
|
+
import { booleanParam, enumParam, fromParam, listParam, localeParam, looseIntParam, numberParam, ORDERED_RANGE, rawParam, safeListParam, toParam, usernameParam, } from './params.js';
|
|
6
7
|
/** What the stats endpoint accepts, on top of the shared color params. */
|
|
7
|
-
const statsQuery = z
|
|
8
|
-
|
|
8
|
+
const statsQuery = z
|
|
9
|
+
.object({
|
|
10
|
+
username: usernameParam,
|
|
9
11
|
repo: safeListParam,
|
|
10
12
|
owner: safeListParam,
|
|
11
13
|
hide: listParam,
|
|
@@ -15,7 +17,8 @@ const statsQuery = z.object({
|
|
|
15
17
|
hide_rank: booleanParam,
|
|
16
18
|
show_icons: booleanParam,
|
|
17
19
|
include_all_commits: booleanParam,
|
|
18
|
-
|
|
20
|
+
from: fromParam,
|
|
21
|
+
to: toParam,
|
|
19
22
|
line_height: rawParam,
|
|
20
23
|
text_bold: booleanParam,
|
|
21
24
|
exclude_repo: listParam,
|
|
@@ -26,107 +29,65 @@ const statsQuery = z.object({
|
|
|
26
29
|
number_format: rawParam,
|
|
27
30
|
role: listParam,
|
|
28
31
|
number_precision: looseIntParam,
|
|
29
|
-
rank_icon: enumParam(
|
|
32
|
+
rank_icon: enumParam(renderStatsCard.OPTIONS.rank_icon),
|
|
30
33
|
show: listParam,
|
|
31
34
|
contribs_include_own_repos: booleanParam,
|
|
32
|
-
})
|
|
35
|
+
})
|
|
36
|
+
.check(ORDERED_RANGE);
|
|
33
37
|
/**
|
|
34
38
|
* Render the stats card for a set of query params.
|
|
35
39
|
*
|
|
36
|
-
* @param query Raw query params, plus any of the shared color params.
|
|
37
|
-
* @param query.username GitHub username.
|
|
38
|
-
* @param query.repo Comma-separated repositories the search-based stats are scoped to.
|
|
39
|
-
* @param query.owner Comma-separated owners the search-based stats are scoped to.
|
|
40
|
-
* @param query.hide Comma-separated stats to hide.
|
|
41
|
-
* @param query.hide_title Whether to hide the card title.
|
|
42
|
-
* @param query.hide_border Whether to hide the card border.
|
|
43
|
-
* @param query.card_width Card width.
|
|
44
|
-
* @param query.hide_rank Whether to hide the rank circle.
|
|
45
|
-
* @param query.show_icons Whether to show the stat icons.
|
|
46
|
-
* @param query.include_all_commits Whether to count commits of all time.
|
|
47
|
-
* @param query.commits_year Year the commits are counted for.
|
|
48
|
-
* @param query.line_height Line height between the stats.
|
|
49
|
-
* @param query.text_bold Whether the stat values are bold.
|
|
50
|
-
* @param query.exclude_repo Comma-separated repositories to exclude.
|
|
51
|
-
* @param query.custom_title Card title.
|
|
52
|
-
* @param query.locale Language the card is rendered in.
|
|
53
|
-
* @param query.disable_animations Whether to disable the card animations.
|
|
54
|
-
* @param query.border_radius Card border radius.
|
|
55
|
-
* @param query.number_format How numbers are abbreviated.
|
|
56
|
-
* @param query.role Comma-separated owner affiliations to include.
|
|
57
|
-
* @param query.number_precision Decimals kept when a number is abbreviated.
|
|
58
|
-
* @param query.rank_icon Which rank indicator to draw.
|
|
59
|
-
* @param query.show Comma-separated extra stats to show.
|
|
60
|
-
* @param query.contribs_include_own_repos Whether the contributed-to counts include the user's own repositories.
|
|
61
|
-
* @param config Deployment config supplying the PAT pool.
|
|
62
40
|
* @returns The rendered card, or a rendered error.
|
|
63
41
|
*/
|
|
64
|
-
const renderStats = async (
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
line_height,
|
|
110
|
-
text_bold,
|
|
111
|
-
custom_title,
|
|
112
|
-
border_radius,
|
|
113
|
-
number_format,
|
|
114
|
-
number_precision,
|
|
115
|
-
locale,
|
|
116
|
-
disable_animations,
|
|
117
|
-
rank_icon,
|
|
118
|
-
show,
|
|
119
|
-
}, username, repository, owner),
|
|
120
|
-
};
|
|
121
|
-
}
|
|
122
|
-
catch (err) {
|
|
123
|
-
return errorResult(err, colors);
|
|
124
|
-
}
|
|
125
|
-
};
|
|
42
|
+
const renderStats = cardHandler(statsQuery, async ({ username, repo, owner, hide, hide_title, hide_border, card_width, hide_rank, show_icons, include_all_commits, from, to, line_height, text_bold, exclude_repo, custom_title, locale, disable_animations, border_radius, number_format, role, number_precision, rank_icon, show, contribs_include_own_repos, }, colors, config) => {
|
|
43
|
+
// A bare repo name is scoped to the user whose card this is.
|
|
44
|
+
const repository = repo.map((name) => name.includes('/') ? name : `${username ?? ''}/${name}`);
|
|
45
|
+
const stats = await fetchStats({
|
|
46
|
+
username,
|
|
47
|
+
include_all_commits,
|
|
48
|
+
exclude_repo,
|
|
49
|
+
include_merged_pull_requests: show.includes('prs_merged') || show.includes('prs_merged_percentage'),
|
|
50
|
+
include_discussions: show.includes('discussions_started'),
|
|
51
|
+
include_discussions_answers: show.includes('discussions_answered'),
|
|
52
|
+
from,
|
|
53
|
+
to,
|
|
54
|
+
repo: repository,
|
|
55
|
+
owner,
|
|
56
|
+
include_prs_authored: show.includes('prs_authored'),
|
|
57
|
+
include_prs_commented: show.includes('prs_commented'),
|
|
58
|
+
include_prs_reviewed: show.includes('prs_reviewed'),
|
|
59
|
+
include_issues_authored: show.includes('issues_authored'),
|
|
60
|
+
include_issues_commented: show.includes('issues_commented'),
|
|
61
|
+
ownerAffiliations: role,
|
|
62
|
+
include_contributions: show.includes('contributions'),
|
|
63
|
+
include_all_time_contribs: show.includes('all_time_contribs'),
|
|
64
|
+
contribs_include_own_repos,
|
|
65
|
+
}, config);
|
|
66
|
+
return renderStatsCard(stats, {
|
|
67
|
+
...colors,
|
|
68
|
+
hide,
|
|
69
|
+
show_icons,
|
|
70
|
+
hide_title,
|
|
71
|
+
hide_border,
|
|
72
|
+
card_width,
|
|
73
|
+
hide_rank,
|
|
74
|
+
include_all_commits,
|
|
75
|
+
line_height,
|
|
76
|
+
text_bold,
|
|
77
|
+
custom_title,
|
|
78
|
+
border_radius,
|
|
79
|
+
number_format,
|
|
80
|
+
number_precision,
|
|
81
|
+
locale,
|
|
82
|
+
disable_animations,
|
|
83
|
+
rank_icon,
|
|
84
|
+
show,
|
|
85
|
+
}, username, repository, owner);
|
|
86
|
+
});
|
|
126
87
|
/**
|
|
127
|
-
* The card,
|
|
128
|
-
* A UI reads them off the function it calls
|
|
88
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
89
|
+
* A UI reads them off the function it calls: `stats.OPTIONS.rank_icon`.
|
|
129
90
|
*/
|
|
130
91
|
export const stats = Object.assign(renderStats, {
|
|
131
|
-
|
|
92
|
+
OPTIONS: { ...renderStatsCard.OPTIONS, role: OWNER_AFFILIATIONS },
|
|
132
93
|
});
|
package/build/api/top-langs.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
declare const
|
|
2
|
+
/**
|
|
3
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
4
|
+
* A UI reads them off the function it calls: `topLangs.OPTIONS.layout`.
|
|
5
|
+
*/
|
|
6
|
+
export declare const topLangs: ((query: import("./params.ts").ApiQuery<z.ZodMiniObject<{
|
|
7
7
|
username: z.ZodMiniType<string | undefined, string | undefined, z.core.$ZodTypeInternals<string | undefined, string | undefined>>;
|
|
8
8
|
hide: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<string[], string | undefined>>;
|
|
9
9
|
hide_title: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
10
10
|
hide_border: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
11
11
|
card_width: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<number | undefined, string | undefined>>;
|
|
12
|
-
layout: z.ZodMiniType<"compact" | "
|
|
12
|
+
layout: z.ZodMiniType<"compact" | "donut" | "donut-vertical" | "normal" | "pie" | undefined, string | undefined, z.core.$ZodTypeInternals<"compact" | "donut" | "donut-vertical" | "normal" | "pie" | undefined, string | undefined>>;
|
|
13
13
|
langs_count: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<number | undefined, string | undefined>>;
|
|
14
14
|
exclude_repo: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<string[], string | undefined>>;
|
|
15
15
|
size_weight: z.ZodMiniType<number | undefined, string | undefined, z.core.$ZodTypeInternals<number | undefined, string | undefined>>;
|
|
@@ -21,17 +21,12 @@ declare const topLangsQuery: z.ZodMiniObject<{
|
|
|
21
21
|
disable_animations: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
22
22
|
hide_progress: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
23
23
|
hide_values: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
24
|
-
stats_format: z.ZodMiniType<"
|
|
25
|
-
}, z.core.$strip
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
*/
|
|
32
|
-
export declare const topLangs: ((query: TopLangsApiQuery, config: CardConfig) => Promise<ApiResult>) & {
|
|
33
|
-
LAYOUTS: readonly ["compact", "normal", "donut", "donut-vertical", "pie"];
|
|
34
|
-
STATS_FORMATS: readonly ["percentages", "bytes"];
|
|
24
|
+
stats_format: z.ZodMiniType<"bytes" | "percentages" | undefined, string | undefined, z.core.$ZodTypeInternals<"bytes" | "percentages" | undefined, string | undefined>>;
|
|
25
|
+
}, z.core.$strip>>, config: import("./index.ts").CardConfig) => Promise<import("./api-result.ts").ApiResult>) & {
|
|
26
|
+
OPTIONS: {
|
|
27
|
+
layout: readonly ["compact", "normal", "donut", "donut-vertical", "pie"];
|
|
28
|
+
stats_format: readonly ["percentages", "bytes"];
|
|
29
|
+
role: import("../graphql/generated/common.ts").RepositoryAffiliation[];
|
|
30
|
+
};
|
|
35
31
|
};
|
|
36
|
-
export {};
|
|
37
32
|
//# sourceMappingURL=top-langs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"top-langs.d.ts","sourceRoot":"","sources":["../../src/api/top-langs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"top-langs.d.ts","sourceRoot":"","sources":["../../src/api/top-langs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAqG9B;;;GAGG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;CAEnB,CAAC"}
|
package/build/api/top-langs.js
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
|
-
import {
|
|
2
|
+
import { renderTopLanguages } from '../cards/top-languages.js';
|
|
3
|
+
import { OWNER_AFFILIATIONS } from '../common/constants.js';
|
|
3
4
|
import { fetchTopLanguages } from '../fetchers/top-languages.js';
|
|
4
|
-
import {
|
|
5
|
-
import { booleanParam, enumParam, listParam, localeParam, looseIntParam, numberParam,
|
|
5
|
+
import { cardHandler } from './handler.js';
|
|
6
|
+
import { booleanParam, enumParam, listParam, localeParam, looseIntParam, numberParam, rawParam, usernameParam, } from './params.js';
|
|
6
7
|
/** What the top-languages endpoint accepts, on top of the shared color params. */
|
|
7
8
|
const topLangsQuery = z.object({
|
|
8
|
-
username:
|
|
9
|
+
username: usernameParam,
|
|
9
10
|
hide: listParam,
|
|
10
11
|
hide_title: booleanParam,
|
|
11
12
|
hide_border: booleanParam,
|
|
12
13
|
card_width: looseIntParam,
|
|
13
|
-
layout: enumParam(
|
|
14
|
+
layout: enumParam(renderTopLanguages.OPTIONS.layout),
|
|
14
15
|
langs_count: looseIntParam,
|
|
15
16
|
exclude_repo: listParam,
|
|
16
17
|
size_weight: numberParam,
|
|
@@ -22,80 +23,42 @@ const topLangsQuery = z.object({
|
|
|
22
23
|
disable_animations: booleanParam,
|
|
23
24
|
hide_progress: booleanParam,
|
|
24
25
|
hide_values: booleanParam,
|
|
25
|
-
stats_format: enumParam(
|
|
26
|
+
stats_format: enumParam(renderTopLanguages.OPTIONS.stats_format),
|
|
26
27
|
});
|
|
27
28
|
/**
|
|
28
29
|
* Render the top languages card for a set of query params.
|
|
29
30
|
*
|
|
30
|
-
* @param query Raw query params, plus any of the shared color params.
|
|
31
|
-
* @param query.username GitHub username.
|
|
32
|
-
* @param query.hide Comma-separated languages to hide.
|
|
33
|
-
* @param query.hide_title Whether to hide the card title.
|
|
34
|
-
* @param query.hide_border Whether to hide the card border.
|
|
35
|
-
* @param query.card_width Card width.
|
|
36
|
-
* @param query.layout How the languages are laid out.
|
|
37
|
-
* @param query.langs_count Number of languages to show.
|
|
38
|
-
* @param query.exclude_repo Comma-separated repositories to exclude.
|
|
39
|
-
* @param query.size_weight Weight given to a language's size.
|
|
40
|
-
* @param query.count_weight Weight given to a language's repository count.
|
|
41
|
-
* @param query.custom_title Card title.
|
|
42
|
-
* @param query.locale Language the card is rendered in.
|
|
43
|
-
* @param query.border_radius Card border radius.
|
|
44
|
-
* @param query.role Comma-separated owner affiliations to include.
|
|
45
|
-
* @param query.disable_animations Whether to disable the card animations.
|
|
46
|
-
* @param query.hide_progress Whether to hide the progress bars.
|
|
47
|
-
* @param query.hide_values Whether to hide the language values.
|
|
48
|
-
* @param query.stats_format Whether values are shown as bytes or percentages.
|
|
49
|
-
* @param config Deployment config supplying the PAT pool.
|
|
50
31
|
* @returns The rendered card, or a rendered error.
|
|
51
32
|
*/
|
|
52
|
-
const renderTopLangs = async (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
card_width,
|
|
78
|
-
hide,
|
|
79
|
-
layout,
|
|
80
|
-
langs_count,
|
|
81
|
-
border_radius,
|
|
82
|
-
locale,
|
|
83
|
-
disable_animations,
|
|
84
|
-
hide_progress,
|
|
85
|
-
hide_values,
|
|
86
|
-
stats_format,
|
|
87
|
-
}),
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
catch (err) {
|
|
91
|
-
return errorResult(err, colors);
|
|
92
|
-
}
|
|
93
|
-
};
|
|
33
|
+
const renderTopLangs = cardHandler(topLangsQuery, async ({ username, hide, hide_title, hide_border, card_width, layout, langs_count, exclude_repo, size_weight, count_weight, custom_title, locale, border_radius, role, disable_animations, hide_progress, hide_values, stats_format, }, colors, config) => {
|
|
34
|
+
const topLangs = await fetchTopLanguages({
|
|
35
|
+
username,
|
|
36
|
+
exclude_repo,
|
|
37
|
+
size_weight,
|
|
38
|
+
count_weight,
|
|
39
|
+
ownerAffiliations: role,
|
|
40
|
+
}, config);
|
|
41
|
+
return renderTopLanguages(topLangs, {
|
|
42
|
+
...colors,
|
|
43
|
+
custom_title,
|
|
44
|
+
hide_title,
|
|
45
|
+
hide_border,
|
|
46
|
+
card_width,
|
|
47
|
+
hide,
|
|
48
|
+
layout,
|
|
49
|
+
langs_count,
|
|
50
|
+
border_radius,
|
|
51
|
+
locale,
|
|
52
|
+
disable_animations,
|
|
53
|
+
hide_progress,
|
|
54
|
+
hide_values,
|
|
55
|
+
stats_format,
|
|
56
|
+
});
|
|
57
|
+
});
|
|
94
58
|
/**
|
|
95
|
-
* The card,
|
|
96
|
-
* A UI reads them off the function it calls
|
|
59
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
60
|
+
* A UI reads them off the function it calls: `topLangs.OPTIONS.layout`.
|
|
97
61
|
*/
|
|
98
62
|
export const topLangs = Object.assign(renderTopLangs, {
|
|
99
|
-
|
|
100
|
-
STATS_FORMATS: TOP_LANG_STATS_FORMATS,
|
|
63
|
+
OPTIONS: { ...renderTopLanguages.OPTIONS, role: OWNER_AFFILIATIONS },
|
|
101
64
|
});
|
package/build/api/wakatime.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import * as z from 'zod/mini';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
declare const
|
|
2
|
+
/**
|
|
3
|
+
* The card, and the values each of its options accepts, keyed by the option's own name.
|
|
4
|
+
* A UI reads them off the function it calls: `wakatime.OPTIONS.layout`.
|
|
5
|
+
*/
|
|
6
|
+
export declare const wakatime: ((query: import("./params.ts").ApiQuery<z.ZodMiniObject<{
|
|
7
7
|
username: z.ZodMiniType<string | undefined, string | undefined, z.core.$ZodTypeInternals<string | undefined, string | undefined>>;
|
|
8
8
|
hide_border: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
9
9
|
card_width: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<number | undefined, string | undefined>>;
|
|
@@ -17,18 +17,12 @@ declare const wakatimeQuery: z.ZodMiniObject<{
|
|
|
17
17
|
hide: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<string[], string | undefined>>;
|
|
18
18
|
api_domain: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
19
19
|
border_radius: z.ZodMiniType<number | undefined, string | undefined, z.core.$ZodTypeInternals<number | undefined, string | undefined>>;
|
|
20
|
-
display_format: z.ZodMiniType<"
|
|
20
|
+
display_format: z.ZodMiniType<"percent" | "time" | undefined, string | undefined, z.core.$ZodTypeInternals<"percent" | "time" | undefined, string | undefined>>;
|
|
21
21
|
disable_animations: z.ZodMiniPipe<z.ZodMiniOptional<z.ZodMiniString<string>>, z.ZodMiniTransform<boolean | undefined, string | undefined>>;
|
|
22
|
-
}, z.core.$strip
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
* A UI reads them off the function it calls, e.g. `wakatime.LAYOUTS`.
|
|
28
|
-
*/
|
|
29
|
-
export declare const wakatime: ((query: WakatimeApiQuery, config: CardConfig) => Promise<ApiResult>) & {
|
|
30
|
-
LAYOUTS: readonly ["compact", "normal"];
|
|
31
|
-
DISPLAY_FORMATS: readonly ["time", "percent"];
|
|
22
|
+
}, z.core.$strip>>, config: import("./index.ts").CardConfig) => Promise<import("./api-result.ts").ApiResult>) & {
|
|
23
|
+
OPTIONS: {
|
|
24
|
+
layout: readonly ["compact", "normal"];
|
|
25
|
+
display_format: readonly ["time", "percent"];
|
|
26
|
+
};
|
|
32
27
|
};
|
|
33
|
-
export {};
|
|
34
28
|
//# sourceMappingURL=wakatime.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wakatime.d.ts","sourceRoot":"","sources":["../../src/api/wakatime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"wakatime.d.ts","sourceRoot":"","sources":["../../src/api/wakatime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAuF9B;;;GAGG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;CAAyE,CAAC"}
|