@cratis/cast 0.2.0 → 0.2.1

package/badges/badgeSvg.ts

@@ -94,6 +94,15 @@ export type BadgeCardOptions = {
     since?: string;
 };
 
+const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+/** `2024-06` as `Jun 2024`, matching the directory's cards; anything else is shown as given. */
+const monthYear = (since: string): string => {
+    const match = /^(\d{4})-(\d{2})$/.exec(since);
+    const month = match ? months[Number(match[2]) - 1] : undefined;
+    return match && month ? `${month} ${match[1]}` : since;
+};
+
 /**
  * The large badge card (480 × 168): a dark card with a tier-colored edge, the Cratis mark, the tier in
  * the italic serif and the verification address. Meant for READMEs, slides and profile pages.
@@ -106,7 +115,7 @@ export function badgeCardSvg(tier: Tier | undefined, options: BadgeCardOptions):
     const handle = options.handle.toLowerCase();
     const address = `${castDirectoryUrl.replace(/^https:\/\//, '')}/${handle}`;
     const who = options.name ? `${options.name} · @${options.handle}` : `@${options.handle}`;
-    const sinceText = options.since ? ` · since ${options.since}` : '';
+    const sinceText = options.since ? ` · since ${monthYear(options.since)}` : '';
     const title = tier ? `${who}: Cratis Cast ${style.label}` : `${who}: not verified in the Cratis Cast`;
 
     return `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${width} ${height}" role="img" aria-label="${escapeXml(title)}">

package/machine/profileFromCastJson.ts

@@ -184,6 +184,7 @@ function finish(data: z.output<typeof castJsonSchema>, document: Record<string,
     };
 
     // Rendered without the captures when only they cannot be: the directory then uses its own GitHub data.
+    // A refused file keeps nothing, captures included: rejected member data never feeds the GitHub-only page.
     const problem = renderProblem(profile);
     if (!problem) return { dropped, profile };
     const { github: _github, writing: _writing, ...withoutCaptures } = profile;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/cast",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "Cast: the Cratis profile-site engine. One cast.yaml becomes a verified, event-sourced personal site with a printable CV, live GitHub numbers and a Cast badge.",
     "keywords": [
         "cratis",

package/site/components/Activity.astro

@@ -55,8 +55,7 @@ const summary = `Contribution heatmap: ${fmt.format(total)} contributions betwee
     ) : <div class="panel overflow-hidden" data-reveal data-heatmap>
       <div class="flex flex-wrap items-center justify-between gap-3 border-b border-line px-5 py-3.5 md:px-7">
         <p class="font-mono text-sm">
-          <span class="text-fg-faint">EventStore:</span> <span class="text-event">github.com/{github.login}</span>
-          <span class="text-fg-faint">· partitioned by day</span>
+          <span class="text-fg-faint">EventStore:</span> <span class="text-event">github.com/{github.login}</span> <span class="text-fg-faint">· partitioned by day</span>
         </p>
         <p class="font-mono text-xs text-fg-faint">snapshot taken <time datetime={github.fetchedAt}>{snapshotDate()}</time></p>
       </div>

package/site/components/Cratis.astro

@@ -14,7 +14,7 @@ interface Props {
   label?: string;
 }
 const { cast } = Astro.props;
-const { cratis: cratisData, cratisRepos, mergedPrFloor, mergedPrTotal, snapshotDate, starsFor } = cast;
+const { cratis: cratisData, cratisRepos, mergedPrFloor, mergedPrTotal, mergedPrStatus, snapshotDate, starsFor } = cast;
 const cratis = cratisData!;
 const { index, title = cratis.title, label = cratis.label } = Astro.props;
 
@@ -56,7 +56,7 @@ const badge = (r: CratisRepo) => (r.founded ? 'b-founded' : r.rank === 1 ? 'b-le
           <div class="flex flex-col bg-ink-900 p-5 md:p-6">
             <dt class="order-2 mt-2 text-sm leading-snug text-fg-muted">
               {h.label}
-              {h.live && <> (<span data-merged-prs="exact">{fmt.format(mergedPrTotal)}</span>, <span data-pr-status>as of {asOf}</span>)</>}
+              {h.live && <> (<span data-merged-prs="exact">{fmt.format(mergedPrTotal)}</span>, <span data-pr-status>{mergedPrStatus}</span>)</>}
             </dt>
             <dd data-merged-prs={h.live ? 'floor' : undefined} class={`order-1 font-display text-[clamp(2.25rem,4.4vw,3.5rem)] leading-none font-[750] tracking-[-0.045em] tabular-nums ${h.accent}`}>{h.value}</dd>
           </div>

package/site/components/Stats.astro

@@ -8,7 +8,7 @@ interface Props {
   cast: CastView;
 }
 const { cast } = Astro.props;
-const { stats: siteStats, cratis, github, cratisRepos, mergedPrFloor, snapshotDate } = cast;
+const { stats: siteStats, cratis, github, cratisRepos, mergedPrFloor, mergedPrStatus } = cast;
 
 type Stat = (typeof siteStats)[number];
 const rankOne = cratisRepos.filter((r) => r.rank === 1).length;
@@ -37,9 +37,9 @@ const accents = ['text-event', 'text-command', 'text-view', 'text-fg'];
               style={`--reveal-delay:${i * 80}ms`}
             >
               <dt class="order-2 max-w-[18ch] text-sm leading-snug text-fg-muted">{s.label}
-                {s.live === 'mergedPullRequests' && <span data-pr-status class="mt-1 block font-mono text-[0.6875rem] text-fg-faint">as of {snapshotDate()}</span>}
+                {s.live === 'mergedPullRequests' && <span data-pr-status class="mt-1 block font-mono text-[0.6875rem] text-fg-faint">{mergedPrStatus}</span>}
               </dt>
-              <dd class={`order-1 font-display text-[clamp(2.5rem,5vw,4rem)] leading-none font-[650] tracking-[-0.04em] tabular-nums ${accents[i % accents.length]}`}>
+              <dd class={`order-1 font-display whitespace-nowrap text-[clamp(2.5rem,5vw,4rem)] leading-none font-[650] tracking-[-0.04em] tabular-nums ${accents[i % accents.length]}`}>
                 {s.prefix}<span data-merged-prs={s.live === 'mergedPullRequests' ? 'number' : undefined} data-count={plain ? undefined : s.value}>{plain ? s.value : fmt.format(s.value)}</span>
                 {s.suffix && <span class="text-fg-faint">{s.suffix}</span>}
               </dd>

package/site/lib/github.ts

@@ -32,6 +32,10 @@ export type GitHubView = {
     github: GitHubSnapshot;
     /** Merged pull requests across the configured organizations, falling back to a stat written in cast.yaml. */
     mergedPrTotal: number;
+    /** Where {@link mergedPrTotal} comes from: 'as of' the capture date, or 'self-reported' for the cast.yaml fallback. */
+    mergedPrStatus: string;
+    /** True when {@link mergedPrTotal} is the cast.yaml fallback: never captured, so never shown as a snapshot or as live. */
+    mergedPrSelfReported: boolean;
     /** Floors to hundreds for an honest "3,100+" style figure. */
     mergedPrFloor: number;
     /** Per-repository figures prefer the snapshot; values written in cast.yaml are fallbacks only. */
@@ -48,7 +52,9 @@ export type GitHubView = {
 
 /** Builds the GitHub view for one profile. */
 export function gitHubView(config: CastConfig, github: GitHubSnapshot): GitHubView {
-    const mergedPrTotal = github.mergedPullRequests.total || (config.stats.find(stat => stat.live === 'mergedPullRequests')?.value ?? 0);
+    const captured = github.mergedPullRequests.total;
+    // The cast.yaml figure was never captured: it carries no capture date, so it is labelled as the owner's own.
+    const mergedPrTotal = captured || (config.stats.find(stat => stat.live === 'mergedPullRequests')?.value ?? 0);
     const cratisRepos = (config.cratis?.repos ?? []).map(repo => {
         const counts = repo.url ? github.repositories[`Cratis/${repo.name}`] : undefined;
         if (!counts) return { ...repo, role: repo.role ?? roleFor(repo, repo.rank) };
@@ -62,6 +68,8 @@ export function gitHubView(config: CastConfig, github: GitHubSnapshot): GitHubVi
     return {
         github,
         mergedPrTotal,
+        mergedPrStatus: captured ? `as of ${formatSnapshotDate(github.fetchedAt)}` : 'self-reported',
+        mergedPrSelfReported: !captured && mergedPrTotal > 0,
         mergedPrFloor: mergedPrTotal >= 100 ? Math.floor(mergedPrTotal / 100) * 100 : mergedPrTotal,
         cratisRepos,
         liveProjects,

package/site/profile/clientCast.ts

@@ -34,6 +34,8 @@ export type ClientCast = {
     projects: { name: string; url: string; pitch: string; version?: string; category: string; features: string[]; stack: string[]; install?: string }[];
     pullRequests: PullRequest[];
     mergedPrTotal: number;
+    /** The total is the cast.yaml fallback, not a capture. */
+    mergedPrSelfReported: boolean;
     snapshotDate: string;
     posts: { headline: string; url: string; part?: number; minutes?: number; themes: string[] }[];
     themes: WritingTheme[];
@@ -85,6 +87,7 @@ export function clientCast(cast: CastView): ClientCast {
         })),
         pullRequests: cast.github.mergedPullRequests.latest,
         mergedPrTotal: cast.mergedPrTotal,
+        mergedPrSelfReported: cast.mergedPrSelfReported,
         snapshotDate: cast.snapshotDate(),
         posts: cast.posts.map(post => ({
             headline: post.headline,

package/site/scripts/terminal.ts

@@ -8,6 +8,7 @@ import { getLiveMerged } from './live';
 import { relativeTime } from '../lib/reltime';
 import { copyText } from '../lib/clipboard';
 import { formatMonth } from '../lib/career';
+import { plainText } from '../lib/inline';
 import { go, goSection, openExternal, profilePath, startReplay } from '../lib/nav';
 import { currentTheme, setTheme } from '../lib/theme';
 
@@ -123,13 +124,20 @@ class Terminal {
 
     private greet(): void {
         this.greeted = true;
-        const { careerEvents, mergedPrTotal, feedOrg, snapshotDate } = this.cast;
-        this.print(c.ev(this.prompt), c.faint(` · stream position ${careerEvents.length} · ${(getLiveMerged()?.total ?? mergedPrTotal).toLocaleString('en-US')} PRs merged in ${feedOrg}`));
+        const { careerEvents, feedOrg, snapshotDate } = this.cast;
+        this.print(c.ev(this.prompt), c.faint(` · stream position ${careerEvents.length} · ${this.mergedTotal()} PRs merged in ${feedOrg}`));
         this.print(c.faint(`GitHub snapshot taken ${snapshotDate}. Everything here is real data.`));
         this.print('Type ', c.fg('help'), ' to see what you can do, or tap a suggestion below.');
         this.blank();
     }
 
+    /** The merged pull request total: live once the browser has it, else the snapshot, marked when self-reported. */
+    private mergedTotal(): string {
+        const live = getLiveMerged();
+        const total = (live?.total ?? this.cast.mergedPrTotal).toLocaleString('en-US');
+        return !live && this.cast.mergedPrSelfReported ? `${total} (self-reported)` : total;
+    }
+
     // --- lifecycle ----------------------------------------------------------------
     open(): void {
         linkRel = this.cast.rel;
@@ -284,7 +292,7 @@ class Terminal {
 
     // --- commands -------------------------------------------------------------------
     private buildCommands(): Record<string, Command> {
-        const { person, now, careerEvents, skills, cratis, talks, profileLinks, firstName, feedOrg, projects, mergedPrTotal, snapshotDate, themes: blogThemes, posts: blogPosts, blogHost } = this.cast;
+        const { person, now, careerEvents, skills, cratis, talks, profileLinks, firstName, feedOrg, projects, snapshotDate, themes: blogThemes, posts: blogPosts, blogHost } = this.cast;
         const SECTIONS = ALL_SECTIONS.filter(([id]) => id === 'top' || this.cast.sections.includes(id));
         const LINKS: Record<string, string> = {
             ...Object.fromEntries(profileLinks.map((profile) => [profile.key.toLowerCase(), profile.url])),
@@ -311,7 +319,7 @@ class Terminal {
                 run: () => {
                     this.print(c.fg(person.name), c.faint(` (${person.handle})`));
                     this.print(person.title, ...(person.location ? [c.faint(' · '), person.location] : []));
-                    this.print(c.ev(person.tagline.replace(/\*/g, '')));
+                    this.print(c.ev(plainText(person.tagline)));
                 },
             },
             now: {
@@ -320,7 +328,7 @@ class Terminal {
                     this.print(c.faint('Projection: '), c.view(`${firstName}.Now`), c.faint(` · projected from ${careerEvents.length} events`));
                     const rows: [string, string][] = Object.entries(now).map(([key, value]) => [
                         key,
-                        Array.isArray(value) ? value.join(', ') : /^\d{4}-\d{2}$/.test(value) ? formatMonth(value) : value.replace(/\*/g, ''),
+                        Array.isArray(value) ? value.join(', ') : /^\d{4}-\d{2}$/.test(value) ? formatMonth(value) : plainText(value),
                     ]);
                     for (const [k, v] of rows) this.print(c.faint(pad(k, 12)), c.fg(v));
                 },
@@ -404,7 +412,7 @@ class Terminal {
                     const live = getLiveMerged();
                     const prs = live?.latest ?? this.cast.pullRequests;
                     const count = flag === '-n' ? Math.max(1, Math.min(prs.length, Number(n) || prs.length)) : prs.length;
-                    this.print(c.faint(`tail ${feedOrg} · ${live ? 'live' : `snapshot taken ${snapshotDate}`} · ${(live?.total ?? mergedPrTotal).toLocaleString('en-US')} merged in total`));
+                    this.print(c.faint(`tail ${feedOrg} · ${live ? 'live' : `snapshot taken ${snapshotDate}`} · ${this.mergedTotal()} merged in total`));
                     prs.slice(0, count).forEach((pr, i) => {
                         this.print(
                             c.faint(pad(i === 0 ? 'HEAD' : `HEAD~${i}`, 8)),
@@ -509,8 +517,8 @@ class Terminal {
                 desc: 'what Cratis is',
                 run: () => {
                     if (!cratis) return this.print(c.faint('Cratis makes event sourcing practical. '), link('https://cratis.io'));
-                    if (cratis.pitch) this.print(c.fg(cratis.pitch.replace(/\*/g, '')));
-                    this.print(c.faint(`${(getLiveMerged()?.total ?? mergedPrTotal).toLocaleString('en-US')} merged PRs · `), link(LINKS['cratis'] ?? 'https://cratis.io'));
+                    if (cratis.pitch) this.print(c.fg(plainText(cratis.pitch)));
+                    this.print(c.faint(`${this.mergedTotal()} merged PRs · `), link(LINKS['cratis'] ?? 'https://cratis.io'));
                     for (const r of cratis.repos) this.print(c.cmd(pad(r.name, 21)), c.faint(pad(r.role, 16)), r.url ? link(r.url, r.desc) : r.desc);
                 },
             },