@jant/core 0.6.8 → 0.6.9

package/src/services/settings.ts

@@ -19,6 +19,7 @@ import {
 } from "../lib/constants.js";
 import {
   baseLocale,
+  isLocale,
   isValidContentLanguage,
   normalizeContentLanguage,
 } from "../i18n/locales.js";
@@ -41,6 +42,8 @@ export interface GeneralSettingsData {
   siteDescription: string;
   siteFooter: string;
   siteLanguage: string;
+  /** Admin UI locale; empty string follows the content language. */
+  dashboardLanguage?: string;
   cjkSerifFont: string;
   showJantBrandingOnHome: boolean;
   homeDefaultView?: FeedKind;
@@ -61,6 +64,11 @@ export interface SiteSettingsResult {
 
 export interface LocaleSettingsData {
   siteLanguage: string;
+  /**
+   * Admin dashboard UI locale. Empty string clears the explicit setting so the
+   * dashboard follows the content language. When set, must be a catalog locale.
+   */
+  dashboardLanguage?: string;
   cjkSerifFont: string;
   timeZone: string;
 }
@@ -97,7 +105,11 @@ export interface SettingsService {
   ): Promise<SiteSettingsResult>;
   updateLocaleSettings(
     data: LocaleSettingsData,
-    opts: { oldLanguage: string; oldCjkSerifFont?: string },
+    opts: {
+      oldLanguage: string;
+      oldCjkSerifFont?: string;
+      oldDashboardLanguage?: string;
+    },
   ): Promise<{ languageChanged: boolean }>;
   updateFeedSettings(data: { mainRssFeed?: FeedKind }): Promise<void>;
   updateHomeBranding(showJantBrandingOnHome: boolean): Promise<void>;
@@ -131,15 +143,16 @@ export interface SettingsService {
    */
   uploadAvatar(data: AvatarUploadData, deps: AvatarUploadDeps): Promise<void>;
   /**
-   * Remove avatar and all favicon-related settings.
-   * Deletes the apple-touch-icon from storage if it exists.
-   *
-   * @param storage - Optional storage driver for deleting the apple-touch-icon file
+   * Remove avatar and all favicon-related settings. The apple-touch-icon's
+   * media row is deleted and its storage object is retired (moved to the
+   * recycle bin, or deleted) via the media service when supplied — so removal
+   * is recoverable rather than erasing the bytes with no trace.
    */
-  removeAvatar(
-    storage?: StorageDriver | null,
-    deps?: { media?: MediaService; storageProvider?: string },
-  ): Promise<void>;
+  removeAvatar(deps?: {
+    storage?: StorageDriver | null;
+    media?: MediaService;
+    storageProvider?: string;
+  }): Promise<void>;
 }
 
 export function createSettingsService(
@@ -301,6 +314,26 @@ export function createSettingsService(
         normalizeContentLanguage(trimmedLanguage),
       );
 
+      // Dashboard UI locale. undefined = leave untouched; "" = clear so the
+      // dashboard follows the content language; otherwise it must be one of the
+      // translated catalog locales.
+      let dashboardChanged = false;
+      if (data.dashboardLanguage !== undefined) {
+        const dashboardLanguage = data.dashboardLanguage.trim();
+        if (dashboardLanguage && !isLocale(dashboardLanguage)) {
+          throw new ValidationError(
+            "Choose a dashboard language Jant is translated into.",
+          );
+        }
+        if (dashboardLanguage) {
+          await this.set("DASHBOARD_LANGUAGE", dashboardLanguage);
+        } else {
+          await this.remove("DASHBOARD_LANGUAGE");
+        }
+        dashboardChanged =
+          (opts.oldDashboardLanguage ?? "") !== dashboardLanguage;
+      }
+
       // CJK serif font setting
       const cjkFont = data.cjkSerifFont?.trim() ?? "";
       if (cjkFont && isCjkSerifFont(cjkFont) && cjkFont !== "off") {
@@ -329,7 +362,8 @@ export function createSettingsService(
       return {
         languageChanged:
           opts.oldLanguage !== trimmedLanguage ||
-          (opts.oldCjkSerifFont ?? "off") !== effectiveCjkFont,
+          (opts.oldCjkSerifFont ?? "off") !== effectiveCjkFont ||
+          dashboardChanged,
       };
     },
 
@@ -469,19 +503,19 @@ export function createSettingsService(
       await this.set("SITE_FAVICON_VERSION", version);
     },
 
-    async removeAvatar(storage, deps) {
+    async removeAvatar(deps) {
       const appleTouchKey = await this.get("SITE_FAVICON_APPLE_TOUCH");
-      if (storage && appleTouchKey) {
-        await storage.delete(appleTouchKey);
-      }
 
+      // Retire the apple-touch-icon through the media service so its object goes
+      // to the recycle bin (recoverable) rather than being erased now. Also
+      // removes its media row.
       if (deps?.media && deps.storageProvider && appleTouchKey) {
         const existing = await deps.media.getByStorageKey(
           appleTouchKey,
           deps.storageProvider,
         );
         if (existing) {
-          await deps.media.delete(existing.id);
+          await deps.media.delete(existing.id, deps.storage);
         }
       }
 

package/src/services/upload-session.ts

@@ -148,6 +148,7 @@ export interface UploadSessionService {
     abortedMultipartUploads: number;
     deletedSessions: number;
     deletedOrphanMedia: number;
+    purgedStorageObjects: number;
   }>;
   abort(id: string, deps: { storage: StorageDriver }): Promise<void>;
 }
@@ -766,9 +767,10 @@ export function createUploadSessionService(
       }
 
       // Reap finalized media that was uploaded during compose but never
-      // attached to a post (`postId IS NULL`) past the grace window. Deletes
-      // the S3/R2 objects and DB rows (best-effort storage delete). Bounded by
-      // the same per-run `limit`; any backlog drains over subsequent runs.
+      // attached to a post (`postId IS NULL`) past the grace window. This now
+      // soft-deletes via the media service: the DB row is removed and the
+      // storage object is enqueued for deferred deletion. Bounded by the same
+      // per-run `limit`; any backlog drains over subsequent runs.
       const orphanIds = await media.listOrphanedMediaIds({
         before: now() - ORPHAN_MEDIA_GRACE_SECONDS,
         limit,
@@ -777,10 +779,18 @@ export function createUploadSessionService(
         await media.deleteByIds(orphanIds, deps.storage);
       }
 
+      // Physically delete storage objects whose recycle window has elapsed.
+      // Skips any object a live media row still references (re-uploads).
+      const purgedStorageObjects = await media.purgeDueStorageObjects(
+        { before: now(), limit, provider: deps.storageDriver },
+        deps.storage,
+      );
+
       return {
         abortedMultipartUploads,
         deletedSessions,
         deletedOrphanMedia: orphanIds.length,
+        purgedStorageObjects,
       };
     },
   };

package/src/styles/tokens.css

@@ -467,13 +467,15 @@
 
 @media (max-width: 760px), (hover: none) and (pointer: coarse) {
   :root {
-    /* Content layer — tighter scale for mobile reading
-       Ratio ≈ 1.9 : 1.4 : 1.15 : 1 (display:title:subtitle:body)
-       13px base → 31.9 / 24 / 19.5 / 16.9 */
+    /* Content layer — tighter scale for mobile reading.
+       Ratio ≈ 1.88 : 1.42 : 1.15 : 1 (display:title:subtitle:body).
+       At 15px root × 0.78 content-scale: 28.7 / 21.6 / 17.6 / 15.2px.
+       Body is floored to a 16px minimum below (max()) for readability;
+       the floor still yields to calc() when the user zooms the root up. */
     --type-content-display: calc(2.45rem * var(--type-content-scale));
     --type-content-title: calc(1.85rem * var(--type-content-scale));
     --type-content-subtitle: calc(1.5rem * var(--type-content-scale));
-    --type-content-body: calc(1.3rem * var(--type-content-scale));
+    --type-content-body: max(16px, calc(1.3rem * var(--type-content-scale)));
 
     /* UI layer — pixel floors for touch targets */
     --type-ui-title: max(16px, var(--type-secondary));

package/src/types/bindings.ts

@@ -35,6 +35,7 @@ export interface Bindings {
   SITE_NAME?: EnvBindingValue;
   SITE_DESCRIPTION?: EnvBindingValue;
   SITE_LANGUAGE?: EnvBindingValue;
+  DASHBOARD_LANGUAGE?: EnvBindingValue;
   HOME_DEFAULT_VIEW?: EnvBindingValue;
   MAIN_RSS_FEED?: EnvBindingValue;
   TIME_ZONE?: EnvBindingValue;

package/src/types/config.ts

@@ -41,6 +41,13 @@ export const CONFIG_FIELDS = {
     envOnly: false,
     envKeys: ["SITE_LANGUAGE"],
   },
+  // Admin dashboard UI locale. Empty means "follow the content language"
+  // (resolved through the catalog fallback chain, i.e. today's behaviour).
+  DASHBOARD_LANGUAGE: {
+    defaultValue: "",
+    envOnly: false,
+    envKeys: ["DASHBOARD_LANGUAGE"],
+  },
   CJK_SERIF_FONT: {
     defaultValue: "off",
     envOnly: false,
@@ -455,6 +462,12 @@ export interface AppConfig {
   /** true only when description is set in DB or ENV (not just the default) */
   siteDescriptionExplicit: boolean;
   siteLanguage: string;
+  /**
+   * Admin dashboard UI locale. Empty string means "follow the content
+   * language" (derived via the catalog fallback chain). When set, it is one of
+   * the translated catalog locales ("en", "zh-Hans", "zh-Hant").
+   */
+  dashboardLanguage: string;
   /** CJK serif font locale: "off", "zh-Hans", "zh-Hant", "ja", or "ko" */
   cjkSerifFont: string;
   homeDefaultView: string;

package/src/ui/dash/settings/GeneralContent.tsx

@@ -15,6 +15,7 @@ export function GeneralContent({
   siteName,
   siteDescription,
   siteLanguage,
+  dashboardLanguage,
   cjkSerifFont,
   siteNameFallback,
   siteDescriptionFallback,
@@ -32,6 +33,7 @@ export function GeneralContent({
   siteName: string;
   siteDescription: string;
   siteLanguage: string;
+  dashboardLanguage: string;
   cjkSerifFont: string;
   siteNameFallback: string;
   siteDescriptionFallback: string;
@@ -101,15 +103,37 @@ export function GeneralContent({
     ),
     siteLanguage: i18n._(
       msg({
-        message: "Language",
-        comment: "@context: Settings form field for site/admin language",
+        message: "Content language",
+        comment:
+          "@context: Settings form field for the public content language",
       }),
     ),
     siteLanguageHelp: i18n._(
       msg({
         message:
-          "Sets the content language announced to readers (HTML lang, RSS) and the dashboard language. Any BCP 47 tag is accepted; tags without a dashboard translation fall back to English.",
-        comment: "@context: Help text under the site language input",
+          "The language your posts are written in. Announced to readers and search engines through HTML lang and your RSS feed. Any BCP 47 tag works.",
+        comment: "@context: Help text under the content language picker",
+      }),
+    ),
+    contentLanguagePreview: i18n._(
+      msg({
+        message: "Readers and search engines see",
+        comment:
+          "@context: Lead text before a live <html lang> preview of the content language",
+      }),
+    ),
+    dashboardLanguage: i18n._(
+      msg({
+        message: "Dashboard language",
+        comment:
+          "@context: Settings form field for the admin interface language",
+      }),
+    ),
+    dashboardLanguageHelp: i18n._(
+      msg({
+        message:
+          "The language this admin dashboard shows in. Available in English, 简体中文, and 繁體中文.",
+        comment: "@context: Help text under the dashboard language picker",
       }),
     ),
     siteLanguageSearchPlaceholder: i18n._(
@@ -308,6 +332,14 @@ export function GeneralContent({
     timezones.map((tz) => ({ value: tz.value, label: tz.label })),
   ).replace(/</g, "\\u003c");
 
+  // The 3 catalog locales Jant's dashboard is translated into. Native-script
+  // labels so each reads in its own language, like the CJK font options.
+  const dashboardLanguagesJson = JSON.stringify([
+    { value: "en", label: "English" },
+    { value: "zh-Hans", label: "简体中文" },
+    { value: "zh-Hant", label: "繁體中文" },
+  ]).replace(/</g, "\\u003c");
+
   const cjkFontsJson = JSON.stringify([
     { value: "off", label: "None" },
     {
@@ -326,6 +358,7 @@ export function GeneralContent({
     siteName,
     siteDescription,
     siteLanguage,
+    dashboardLanguage,
     cjkSerifFont,
     mainRssFeed,
     timeZone,
@@ -341,6 +374,7 @@ export function GeneralContent({
           labels={labels}
           timezones={timezonesJson}
           cjk-fonts={cjkFontsJson}
+          dashboard-languages={dashboardLanguagesJson}
           sitename-fallback={siteNameFallback}
           sitedescription-fallback={siteDescriptionFallback}
           main-feed-url={mainFeedUrl}

package/src/ui/layouts/BaseLayout.tsx

@@ -277,6 +277,7 @@ export const BaseLayout: FC<PropsWithChildren<BaseLayoutProps>> = ({
       {raw("<!DOCTYPE html>")}
       <html
         lang={resolvedLang}
+        data-theme={appConfig?.themeId}
         data-theme-mode={themeMode}
         data-site-path-prefix={sitePathPrefix}
         data-asset-base-path={assetBasePath}

package/src/ui/layouts/__tests__/BaseLayout.test.tsx

@@ -320,6 +320,19 @@ describe("BaseLayout", () => {
     expect(html).toContain('data-asset-base-path="/blog/_assets"');
   });
 
+  it("exposes the active theme id on the root html element", async () => {
+    const { BaseLayout } = await loadBaseLayout();
+    const html = renderToString(
+      BaseLayout({
+        title: "Jant",
+        c: createContext("featured", { themeId: "frost" }),
+        children: "Test",
+      }),
+    );
+
+    expect(html).toContain('data-theme="frost"');
+  });
+
   it("renders theme-color tags that follow the active theme in auto mode", async () => {
     const { BaseLayout } = await loadBaseLayout();
     const html = renderToString(

package/dist/app-DaxS_Cz-.js

@@ -1,6 +0,0 @@
-import "./url-BMYO-Zlt.js";
-import { t as createApp } from "./app-9P4rVCe2.js";
-import "./export-Be082J0n.js";
-import "./env-OHRKGcMj.js";
-import "./github-sync-D1Cw8mOY.js";
-export { createApp };