@jant/core 0.6.14 → 0.6.16

package/src/types/raw-assets.d.ts

@@ -26,6 +26,11 @@ declare module "*.js?raw" {
   export default content;
 }
 
+declare module "*.md?raw" {
+  const content: string;
+  export default content;
+}
+
 declare module "*.xml?raw" {
   const content: string;
   export default content;

package/src/types/views.ts

@@ -92,7 +92,7 @@ export interface PostView {
   // Media -- URLs pre-computed
   media: MediaView[];
 
-  // Collections this post belongs to
+  // Thread-level Collections projected onto this post
   collections: CollectionTagView[];
 
   // Thread context
@@ -102,6 +102,12 @@ export interface PostView {
   threadRootId?: string;
   /** Whether this post is the last (most recent) in its thread. Controls reply button visibility. */
   isLastInThread: boolean;
+  /**
+   * TypeID of an unpublished draft that already ends this thread, set only for
+   * the signed-in author on surfaces that do not render drafts. Replying here
+   * would fork the chain, so the reply affordance resumes that draft instead.
+   */
+  draftTailId?: string;
   /** Number of published replies in this thread when relevant to the current view. */
   replyCount?: number;
 
@@ -157,6 +163,7 @@ export interface NavItemView {
   type: NavItemType;
   systemKey?: SystemNavKey;
   collectionId?: string;
+  postId?: string;
   label: string;
   url: string;
   /** "header" = visible in nav bar, "more" = under More dropdown */
@@ -173,7 +180,7 @@ export interface NavItemView {
 
 export type SuggestedNavLinkTargetType = "page" | "collection" | "archive";
 
-export type SuggestedNavLinkNavItemType = "link" | "collection";
+export type SuggestedNavLinkNavItemType = "link" | "collection" | "page";
 
 export interface SuggestedNavLink {
   key: string;
@@ -182,6 +189,15 @@ export interface SuggestedNavLink {
   targetType: SuggestedNavLinkTargetType;
   navItemType: SuggestedNavLinkNavItemType;
   collectionId?: string;
+  postId?: string;
+}
+
+/** A published titled note eligible to be added to site navigation. */
+export interface NavigationPageCandidate {
+  id: string;
+  title: string;
+  slug: string;
+  updatedAt: number;
 }
 
 /**
@@ -215,13 +231,15 @@ export interface SearchResultView {
 export interface TimelineItemView {
   post: PostView;
   threadPreview?: {
-    secondReply?: PostView;
-    penultimateReply?: PostView;
+    leadingReplies: PostView[];
+    trailingReplies: PostView[];
     latestReply: PostView;
     totalReplyCount: number;
   };
   curatedThread?: {
     rootPost: PostView;
+    /** Show ratings on non-highlighted context posts (complete Collection Threads). */
+    showContextRatings: boolean;
     segments: {
       post: PostView;
       hiddenBeforeCount: number;

package/src/ui/__tests__/font-themes.test.ts

@@ -1,9 +1,11 @@
 import { describe, it, expect } from "vitest";
 import {
   BUILTIN_FONT_THEMES,
+  DEFAULT_FONT_CJK_SANS_FALLBACK,
   DEFAULT_FONT_CJK_SERIF_FALLBACK,
-  getCjkSerifCssVariables,
+  getCjkFontCssVariables,
   getFontThemeCssVariables,
+  resolveCjkFontProfile,
 } from "../font-themes.js";
 
 describe("BUILTIN_FONT_THEMES", () => {
@@ -90,52 +92,62 @@ describe("BUILTIN_FONT_THEMES", () => {
     expect(variables["--type-label-weight"]).toBe("var(--fw-semibold)");
   });
 
-  it("routes zh-Hans to the simplified CJK serif fallback first", () => {
-    const variables = getCjkSerifCssVariables("zh-Hans");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes zh-Hans content to simplified serif and sans fallbacks", () => {
+    const variables = getCjkFontCssVariables("zh-Hans", "off");
+    const serif = variables["--font-cjk-serif-fallback"];
+    const sans = variables["--font-cjk-sans-fallback"];
 
-    expect(stack).toContain('"Songti SC"');
-    expect(stack).toContain('"Noto Serif SC"');
-    expect(stack.indexOf('"Songti SC"')).toBeLessThan(
-      stack.indexOf('"Noto Serif SC"'),
+    expect(serif).toContain('"Songti SC"');
+    expect(serif).toContain('"Noto Serif SC"');
+    expect(sans.indexOf('"PingFang SC"')).toBeLessThan(
+      sans.indexOf('"PingFang TC"'),
     );
   });
 
-  it("routes zh-Hant to the traditional CJK serif fallback first", () => {
-    const variables = getCjkSerifCssVariables("zh-Hant");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes zh-Hant content to traditional serif and sans fallbacks", () => {
+    const variables = getCjkFontCssVariables("zh-Hant", "off");
+    const serif = variables["--font-cjk-serif-fallback"];
+    const sans = variables["--font-cjk-sans-fallback"];
 
-    expect(stack).toContain('"Songti TC"');
-    expect(stack).toContain('"Noto Serif TC"');
-    expect(stack.indexOf('"Songti TC"')).toBeLessThan(
-      stack.indexOf('"Noto Serif TC"'),
+    expect(serif).toContain('"Songti TC"');
+    expect(serif).toContain('"Noto Serif TC"');
+    expect(sans.indexOf('"PingFang TC"')).toBeLessThan(
+      sans.indexOf('"PingFang SC"'),
     );
   });
 
-  it("routes ja to the Japanese CJK serif fallback", () => {
-    const variables = getCjkSerifCssVariables("ja");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes Japanese content to the Japanese font profile", () => {
+    const variables = getCjkFontCssVariables("ja", "off");
 
-    expect(stack).toContain('"Noto Serif JP"');
+    expect(variables["--font-cjk-serif-fallback"]).toContain('"Noto Serif JP"');
+    expect(variables["--font-cjk-sans-fallback"]).toContain('"Noto Sans JP"');
   });
 
-  it("routes ko to the Korean CJK serif fallback", () => {
-    const variables = getCjkSerifCssVariables("ko");
-    const stack = variables["--font-cjk-serif-fallback"];
+  it("routes Korean content to the Korean font profile", () => {
+    const variables = getCjkFontCssVariables("ko", "off");
 
-    expect(stack).toContain('"Noto Serif KR"');
+    expect(variables["--font-cjk-serif-fallback"]).toContain('"Noto Serif KR"');
+    expect(variables["--font-cjk-sans-fallback"]).toContain('"Noto Sans KR"');
   });
 
-  it("does not inject a runtime override when CJK is off", () => {
-    expect(getCjkSerifCssVariables("off")).toEqual({});
+  it("uses the explicit CJK fallback for an unadapted content language", () => {
+    expect(resolveCjkFontProfile("en", "zh-Hans")).toBe("zh-Hans");
   });
 
-  it("does not inject a runtime override for unrecognized values", () => {
-    expect(getCjkSerifCssVariables("en")).toEqual({});
+  it("lets an adapted content language override the manual fallback", () => {
+    expect(resolveCjkFontProfile("zh-Hant", "zh-Hans")).toBe("zh-Hant");
   });
 
-  it("keeps a default CJK serif fallback for the base tokens", () => {
-    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toContain('"Songti SC"');
-    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toContain('"Noto Serif SC"');
+  it("keeps the default profile neutral", () => {
+    expect(getCjkFontCssVariables("en", "off")).toEqual({});
+    expect(DEFAULT_FONT_CJK_SERIF_FALLBACK).toBe('"Jant Language Fallback"');
+    expect(DEFAULT_FONT_CJK_SANS_FALLBACK).toBe('"Jant Language Fallback"');
+  });
+
+  it("puts language slots into every serif and sans theme stack", () => {
+    for (const theme of BUILTIN_FONT_THEMES) {
+      const combined = `${theme.headingFontFamily} ${theme.bodyFontFamily}`;
+      expect(combined).toMatch(/var\(--font-cjk-(?:serif|sans)-fallback\)/);
+    }
   });
 });

package/src/ui/compose/ComposeDialog.tsx

@@ -13,6 +13,7 @@ import type { FC } from "hono/jsx";
 import { MAX_THREAD_POSTS, type Collection } from "../../types.js";
 import { useLingui } from "../../i18n/context.js";
 import { getCollectionFormLabels } from "../shared/collection-management-labels.js";
+import type { ComposeLabels } from "../../client/components/compose-types.js";
 
 export interface ComposeDialogProps {
   collections?: Collection[];
@@ -36,7 +37,7 @@ export const ComposeForm: FC<ComposeFormProps> = ({
 }) => {
   const { i18n } = useLingui();
 
-  const labels = JSON.stringify({
+  const labelsObject = {
     cancel: i18n._(
       msg({
         message: "Cancel",
@@ -125,8 +126,9 @@ export const ComposeForm: FC<ComposeFormProps> = ({
     ),
     titlePlaceholder: i18n._(
       msg({
-        message: "Title",
-        comment: "@context: Compose note title placeholder",
+        message: "Untitled",
+        comment:
+          "@context: Compose note title placeholder. States what the note is while the field is empty rather than asking for a title — untitled notes are a normal kind of note here, and Archive files them under this same word.",
       }),
     ),
     bodyPlaceholder: i18n._(
@@ -236,7 +238,7 @@ export const ComposeForm: FC<ComposeFormProps> = ({
     title: i18n._(
       msg({
         message: "Title",
-        comment: "@context: Compose toolbar - title tooltip",
+        comment: "@context: Compose toolbar - show or hide the title field",
       }),
     ),
     fullscreen: i18n._(
@@ -476,6 +478,19 @@ export const ComposeForm: FC<ComposeFormProps> = ({
         comment: "@context: Drafts panel empty state",
       }),
     ),
+    previewDraft: i18n._(
+      msg({
+        message: "Preview",
+        comment: "@context: Draft item action that opens its rendered preview",
+      }),
+    ),
+    draftActions: i18n._(
+      msg({
+        message: "Draft actions",
+        comment:
+          "@context: Accessible label for a draft item's more-actions button",
+      }),
+    ),
     deleteDraft: i18n._(
       msg({
         message: "Delete Draft",
@@ -635,9 +650,9 @@ export const ComposeForm: FC<ComposeFormProps> = ({
     ),
     publishDateSummaryNow: i18n._(
       msg({
-        message: "Publish now",
+        message: "Now",
         comment:
-          "@context: Compose summary shown near the submit controls when an edited post no longer has a custom publish date",
+          "@context: Value shown on a post's date control when it will publish at the current time",
       }),
     ),
     publishDateSummaryAction: i18n._(
@@ -674,9 +689,9 @@ export const ComposeForm: FC<ComposeFormProps> = ({
     ),
     publishSlugSummaryAuto: i18n._(
       msg({
-        message: "Auto link",
+        message: "/…",
         comment:
-          "@context: Compose summary shown near the submit controls when a manual custom link is cleared",
+          "@context: Value shown on a post's permalink control when the link is generated automatically — a stand-in for the path the server will assign. Sits next to real permalinks rendered as /my-post, so keep the leading slash",
       }),
     ),
     publishSlugSummaryAction: i18n._(
@@ -780,24 +795,24 @@ export const ComposeForm: FC<ComposeFormProps> = ({
           "@context: Toast shown when a local draft is restored on compose open",
       }),
     ),
-    newThread: i18n._(
+    closeCompose: i18n._(
       msg({
-        message: "New Thread",
+        message: "Close compose",
         comment:
-          "@context: Compose dialog header title when composing a thread",
+          "@context: Post options row that leaves the composer; prompts to save a draft first if there is unsaved work",
       }),
     ),
-    replyTitle: i18n._(
+    editing: i18n._(
       msg({
-        message: "Reply",
+        message: "Editing",
         comment:
-          "@context: Compose dialog header title when replying to a post",
+          "@context: Marker above the composer when changing a post that is already published",
       }),
     ),
-    editTitle: i18n._(
+    composeDialogLabel: i18n._(
       msg({
-        message: "Edit",
-        comment: "@context: Compose dialog header title when editing a post",
+        message: "Compose",
+        comment: "@context: Accessible name for the compose dialog",
       }),
     ),
     slashHint: i18n._(
@@ -807,8 +822,84 @@ export const ComposeForm: FC<ComposeFormProps> = ({
           "@context: First-use hint shown over the compose editor to surface the slash command menu",
       }),
     ),
+    tableControls: {
+      toolbarLabel: i18n._(
+        msg({
+          message: "Table controls",
+          comment: "@context: Accessible label for the compose table toolbar",
+        }),
+      ),
+      addRowAbove: i18n._(
+        msg({
+          message: "Add row above",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addRowBelow: i18n._(
+        msg({
+          message: "Add row below",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addColumnBefore: i18n._(
+        msg({
+          message: "Add column before",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      addColumnAfter: i18n._(
+        msg({
+          message: "Add column after",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      options: i18n._(
+        msg({
+          message: "Table options",
+          comment: "@context: Compose table menu button label",
+        }),
+      ),
+      deleteRow: i18n._(
+        msg({
+          message: "Delete row",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      deleteColumn: i18n._(
+        msg({
+          message: "Delete column",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      toggleHeaderRow: i18n._(
+        msg({
+          message: "Toggle header row",
+          comment: "@context: Compose table action",
+        }),
+      ),
+      deleteTable: i18n._(
+        msg({
+          message: "Delete table",
+          comment: "@context: Destructive compose table action",
+        }),
+      ),
+      sizePickerLabel: i18n._(
+        msg({
+          message: "Choose table size",
+          comment: "@context: Accessible title for the table dimension picker",
+        }),
+      ),
+      insertTableSize: i18n._(
+        msg({
+          message: "Insert %rows% by %cols% table",
+          comment:
+            "@context: Accessible label for a table size option. %rows% and %cols% are replaced with dimensions",
+        }),
+      ),
+    },
     collectionFormLabels: getCollectionFormLabels(i18n),
-  }).replace(/</g, "\\u003c");
+  } satisfies ComposeLabels;
+  const labels = JSON.stringify(labelsObject).replace(/</g, "\\u003c");
 
   const collectionsJson = JSON.stringify(
     (collections ?? []).map((c) => ({
@@ -830,7 +921,6 @@ export const ComposeForm: FC<ComposeFormProps> = ({
     >
       {/* SSR fallback skeleton */}
       <div class="compose-dialog-inner">
-        <div class="compose-dialog-header" />
         <div class="compose-body skel-section-md" />
       </div>
     </jant-compose-dialog>