@geekity/cms 0.41.0 → 0.42.1

package/dist/writing/progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/writing/progress.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,UAAU,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,EACnB,GAAG,EAAE,IAAI,EACT,QAAQ,EAAE,MAAM,GACf,eAAe,CAajB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAEhF"}

package/dist/writing/progress.js

@@ -0,0 +1,83 @@
+import { Temporal } from '@js-temporal/polyfill';
+import { writingDay } from './ledger.js';
+export function writingProgress(ledger, goals, now, timezone) {
+    const today = Temporal.PlainDate.from(writingDay(now, timezone));
+    const wordsToday = ledger.days[today.toString()] ?? 0;
+    return {
+        today: today.toString(),
+        wordsToday,
+        period: periodProgress(ledger, goals, today),
+        streak: {
+            ...streaks(ledger, goals.streak, today),
+            todayMet: meetsStreak(wordsToday, goals.streak),
+            todayNeeds: Math.max(0, goals.streak.dailyWords - wordsToday),
+        },
+    };
+}
+export function meetsStreak(words, rule) {
+    return (words ?? 0) >= rule.dailyWords;
+}
+function periodProgress(ledger, goal, today) {
+    const [start, end] = periodBounds(goal.period, today);
+    let words = 0;
+    for (const [day, total] of Object.entries(ledger.days)) {
+        if (Temporal.PlainDate.compare(start, day) <= 0 &&
+            Temporal.PlainDate.compare(day, today) <= 0) {
+            words += total;
+        }
+    }
+    const elapsed = daysBetween(start, today) + 1;
+    const length = daysBetween(start, end) + 1;
+    const expected = Math.ceil((goal.words * elapsed) / length);
+    return {
+        start: start.toString(),
+        end: end.toString(),
+        words,
+        goal: goal.words,
+        expected,
+        pace: words - expected,
+    };
+}
+function periodBounds(period, today) {
+    switch (period) {
+        case 'day':
+            return [today, today];
+        case 'week': {
+            const monday = today.subtract({ days: today.dayOfWeek - 1 });
+            return [monday, monday.add({ days: 6 })];
+        }
+        case 'month':
+            return [today.with({ day: 1 }), today.with({ day: today.daysInMonth })];
+        case 'year':
+            return [today.with({ month: 1, day: 1 }), today.with({ month: 12, day: 31 })];
+    }
+}
+function streaks(ledger, rule, today) {
+    const first = Object.keys(ledger.days)
+        .filter((day) => meetsStreak(ledger.days[day], rule))
+        .sort()[0];
+    if (first === undefined)
+        return { current: 0, best: 0 };
+    let run = 0;
+    let misses = 0;
+    let best = 0;
+    for (let day = Temporal.PlainDate.from(first); Temporal.PlainDate.compare(day, today) < 0; day = day.add({ days: 1 })) {
+        if (meetsStreak(ledger.days[day.toString()], rule)) {
+            run += 1;
+            misses = 0;
+        }
+        else {
+            misses += 1;
+            if (misses > rule.missesAllowed)
+                run = 0;
+        }
+        best = Math.max(best, run);
+    }
+    if (meetsStreak(ledger.days[today.toString()], rule))
+        run += 1;
+    return { current: run, best: Math.max(best, run) };
+}
+function daysBetween(from, to) {
+    return from.until(to, { largestUnit: 'day' }).days;
+}
+//# sourceMappingURL=progress.js.map

package/dist/writing/progress.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekity/cms",
-  "version": "0.41.0",
+  "version": "0.42.1",
   "type": "module",
   "description": "A file-first CMS: Markdown content, a SQLite index, a Hono server that is both the editor and the public site.",
   "license": "MIT",
@@ -52,6 +52,7 @@
     "@fedify/hono": "^2.4.4",
     "@fedify/sqlite": "^2.4.4",
     "@fedify/vocab": "^2.4.4",
+    "@geekity/md2gemini": "^0.1.1",
     "@hono/node-server": "^2.1.5",
     "@js-temporal/polyfill": "^0.5.1",
     "gray-matter": "^4.0.3",

package/themes/default/layouts/404.gmi.njk

@@ -0,0 +1,10 @@
+{#
+  The body of the 404 page's gemtext. Converting 404.md.njk would turn its
+  closing sentence into "Go home[1], or search the site[2]." over two
+  numbered link lines, so the links are written as link lines here.
+  The context is the Markdown one's; links go through `geminiUrl`.
+#}
+Content not found.
+
+=> {{ "/" | geminiUrl }} Home
+=> {{ "/search/" | geminiUrl }} Search the site

package/themes/default/layouts/410.gmi.njk

@@ -0,0 +1,8 @@
+{#
+  The body of the 410 page's gemtext, written as gemtext for the reason
+  404.gmi.njk gives. The context is the 404's.
+#}
+This content has been deleted.
+
+=> {{ "/" | geminiUrl }} Home
+=> {{ "/search/" | geminiUrl }} Search the site

package/themes/default/layouts/500.gmi.njk

@@ -0,0 +1,9 @@
+{#
+  The body of the 500 page's gemtext, written as gemtext for the reason
+  404.gmi.njk gives. The context is the 404's. When this fails too, the CMS
+  writes a fixed body instead.
+#}
+This page could not be shown because of a problem on the server. Try again in a moment.
+
+=> {{ "/" | geminiUrl }} Home
+=> {{ "/search/" | geminiUrl }} Search the site

package/themes/default/layouts/503.gmi.njk

@@ -0,0 +1,9 @@
+{#
+  The body of the maintenance page's gemtext, written as gemtext for the
+  reason 404.gmi.njk gives. `until` and `untilText` are as in 503.md.njk.
+  When this fails, the CMS writes a fixed body instead.
+#}
+This site is down for maintenance and will be back shortly.{% if until %} It should be back by {{ untilText }}.{% endif %} Please try again then.
+
+=> {{ "/" | geminiUrl }} Home
+=> {{ "/search/" | geminiUrl }} Search the site

package/themes/default/layouts/base.njk

@@ -167,6 +167,9 @@
     {% if activityStreams %}
     <link rel="alternate" type="application/activity+json" href="{{ activityStreams }}">
     {% endif %}
+    {% if capsuleUrl %}
+    <link rel="alternate" type="text/gemini" href="{{ capsuleUrl }}">
+    {% endif %}
     {% endblock %}
     {% if webmention %}
     <link rel="webmention" href="{{ webmention | url }}">

package/themes/default/partials/markdown-footer.md.njk

@@ -27,7 +27,9 @@
   under its list item. `commentForm` and `contactForm` are each the `url` of
   the form on the HTML page, printed as it is, since a form needs HTML;
   `commentForm` is absent while comments are closed. `webmention` is there
-  when the site takes webmentions.
+  when the site takes webmentions. `capsuleUrl` is this page's gemini:// URL
+  while the site serves Gemini, and is never set when this is written as
+  gemtext.
   `thread` is on a comment's own page, as the header describes it: its
   `comment.replies` are threaded as a conversation's are, and `onPostUrl` is the
   comment on the post's page.
@@ -135,6 +137,12 @@ Or reply from your own site and send a [webmention](https://indieweb.org/Webment
 
 [Send a message on the web page]({{ contactForm.url }})
 
+{% endif %}
+{% if capsuleUrl %}
+## Gemini
+
+[Read this page over Gemini]({{ capsuleUrl }})
+
 {% endif %}
 {% if feeds.length %}
 ## Feeds