dsh-fonttune 0.1.6 → 0.2.0

package/lib/index.js

@@ -10,32 +10,43 @@
  * 2. Contribute a `<style>` row to the served index. The browser half applies
  *    the same declarations once it activates, but that is after the shell has
  *    already painted; injecting here is what keeps the first frame from
- *    flashing DSH's default typography.
+ *    flashing DSH's default typography. When `perTheme` is on, the row carries
+ *    the dark theme's rules prefixed with the dark-theme attribute, so the
+ *    first paint of each theme already uses that theme's own values.
  *
  * @module dsh-fonttune
  */
 import z from "@deepseek-ai/schemastery";
 // Default import, not named: `shared.cjs` is a CommonJS module, and Node's
 // CJS-to-ESM interop only guarantees `module.exports` as the default binding
-// (staticky-detected named exports would break this half at boot).
+// (statically-detected named exports would break this half at boot).
 import shared from "./shared.cjs";
 
 const {
   buildFontCss,
+  CODE_LINE_HEIGHT_FIELD,
   CODE_SIZE_FIELD,
   CODE_WEIGHT_FIELD,
+  DARK_VALUES_FIELD,
   FALLBACK_TOKENS,
+  FEATURES_FIELD,
+  LIGATURES_FIELD,
+  LINE_HEIGHT_DIALOG_FIELD,
+  LINE_HEIGHT_FIELD,
+  MAX_FEATURES_LENGTH,
+  MAX_STACK_LENGTH,
   MONO_FIELD,
   NAMESPACE,
   normalizeConfig,
+  NO_SYNTHETIC_BOLD_FIELD,
+  NO_SYNTHETIC_ITALIC_FIELD,
+  PER_THEME_FIELD,
   SANS_FIELD,
+  SIZE_DIALOG_FIELD,
   SIZE_FIELD,
-  SIZE_MAX,
-  SIZE_MIN,
+  STACK_DIALOG_FIELD,
+  WEIGHT_DIALOG_FIELD,
   WEIGHT_FIELD,
-  WEIGHT_MAX,
-  WEIGHT_MIN,
-  WEIGHT_UNSET,
 } = shared;
 
 /**
@@ -49,14 +60,22 @@ const SAFE_STACK = /^[^{};<>\\]*$/;
  */
 const MAX_STACK = 200;
 
+/**
+ * A `font-feature-settings` value may only carry feature tags, on/off/number
+ * and the entry separators — anything else cannot appear in a valid value.
+ */
+const SAFE_FEATURES = /^[a-zA-Z0-9"' ,]*$/;
+
 /**
  * The durable settings section.
  *
  * Every field defaults to "leave DSH alone": an empty stack injects no family
- * rule, a zero offset injects no size rule on either axis, and a zero weight
- * injects no weight rule (an unset CODE weight still writes the rule that keeps
- * code out of the body weight). Installing the plugin therefore changes nothing
- * until the user asks for something.
+ * rule, a zero offset injects no size rule, a ratio of 100 injects no
+ * line-height rule, and a zero weight injects no weight rule (an unset code
+ * weight still writes the rule that keeps code out of the interface/dialog
+ * weights). A dialog field left at its neutral value follows the interface
+ * value. Installing the plugin therefore changes nothing until the user asks
+ * for something.
  */
 export const Config = z.object({
   [SANS_FIELD]: z
@@ -64,7 +83,15 @@ export const Config = z.object({
     .max(MAX_STACK)
     .pattern(SAFE_STACK)
     .default("")
-    .description("CSS font-family list for the UI and conversation text"),
+    .description("CSS font-family list for the interface text"),
+  [STACK_DIALOG_FIELD]: z
+    .string()
+    .max(MAX_STACK)
+    .pattern(SAFE_STACK)
+    .default("")
+    .description(
+      "CSS font-family list for the conversation markdown; empty follows the interface stack"
+    ),
   [MONO_FIELD]: z
     .string()
     .max(MAX_STACK)
@@ -73,36 +100,121 @@ export const Config = z.object({
     .description("CSS font-family list for code and monospaced text"),
   [SIZE_FIELD]: z
     .number()
-    .min(SIZE_MIN)
-    .max(SIZE_MAX)
+    .min(shared.SIZE_MIN)
+    .max(shared.SIZE_MAX)
     .default(0)
     .description(
-      `Body/UI font-size offset in px (${SIZE_MIN}..${SIZE_MAX}, 0 keeps DSH's own sizes)`
+      `Interface font-size offset in px (${shared.SIZE_MIN}..${shared.SIZE_MAX}, 0 keeps DSH's own sizes)`
+    ),
+  [SIZE_DIALOG_FIELD]: z
+    .number()
+    .min(shared.SIZE_MIN)
+    .max(shared.SIZE_MAX)
+    .default(0)
+    .description(
+      "Conversation font-size offset in px; 0 follows the interface offset"
     ),
   [CODE_SIZE_FIELD]: z
     .number()
-    .min(SIZE_MIN)
-    .max(SIZE_MAX)
+    .min(shared.SIZE_MIN)
+    .max(shared.SIZE_MAX)
     .default(0)
     .description(
-      `Code font-size offset in px (${SIZE_MIN}..${SIZE_MAX}, 0 keeps DSH's own sizes; independent of the body offset)`
+      `Code font-size offset in px (${shared.SIZE_MIN}..${shared.SIZE_MAX}, 0 keeps DSH's own sizes; independent of the interface offset)`
     ),
   [WEIGHT_FIELD]: z
     .number()
-    .min(WEIGHT_UNSET)
-    .max(WEIGHT_MAX)
-    .default(WEIGHT_UNSET)
+    .min(shared.WEIGHT_UNSET)
+    .max(shared.WEIGHT_MAX)
+    .default(shared.WEIGHT_UNSET)
     .description(
-      `Body/UI font weight (${WEIGHT_MIN}..${WEIGHT_MAX}, ${WEIGHT_UNSET} keeps DSH's own weights; code is not affected)`
+      `Interface font weight (${shared.WEIGHT_MIN}..${shared.WEIGHT_MAX}, ${shared.WEIGHT_UNSET} keeps DSH's own weights; code is not affected)`
+    ),
+  [WEIGHT_DIALOG_FIELD]: z
+    .number()
+    .min(shared.WEIGHT_UNSET)
+    .max(shared.WEIGHT_MAX)
+    .default(shared.WEIGHT_UNSET)
+    .description(
+      "Conversation font weight; 0 follows the interface weight"
     ),
   [CODE_WEIGHT_FIELD]: z
     .number()
-    .min(WEIGHT_UNSET)
-    .max(WEIGHT_MAX)
-    .default(WEIGHT_UNSET)
+    .min(shared.WEIGHT_UNSET)
+    .max(shared.WEIGHT_MAX)
+    .default(shared.WEIGHT_UNSET)
+    .description(
+      `Code font weight (${shared.WEIGHT_MIN}..${shared.WEIGHT_MAX}, ${shared.WEIGHT_UNSET} keeps DSH's own weights; independent of the interface weight)`
+    ),
+  [LINE_HEIGHT_FIELD]: z
+    .number()
+    .min(shared.LINE_HEIGHT_MIN)
+    .max(shared.LINE_HEIGHT_MAX)
+    .default(shared.LINE_HEIGHT_MIN)
+    .description(
+      "Interface line-height ratio in percent (100 keeps DSH's own line heights)"
+    ),
+  [LINE_HEIGHT_DIALOG_FIELD]: z
+    .number()
+    .min(shared.LINE_HEIGHT_MIN)
+    .max(shared.LINE_HEIGHT_MAX)
+    .default(shared.LINE_HEIGHT_MIN)
+    .description(
+      "Conversation line-height ratio in percent; 100 follows the interface ratio"
+    ),
+  [CODE_LINE_HEIGHT_FIELD]: z
+    .number()
+    .min(shared.CODE_LINE_HEIGHT_MIN)
+    .max(shared.CODE_LINE_HEIGHT_MAX)
+    .default(0)
+    .description(
+      "Code line-height offset in px (0 keeps DSH's own line heights)"
+    ),
+  [LIGATURES_FIELD]: z
+    .number()
+    .min(0)
+    .max(2)
+    .default(0)
+    .description("Code ligatures: 0 DSH default, 1 forced on, 2 forced off"),
+  [FEATURES_FIELD]: z
+    .string()
+    .max(MAX_FEATURES_LENGTH)
+    .pattern(SAFE_FEATURES)
+    .default("")
+    .description("Advanced font-feature-settings value for code"),
+  [NO_SYNTHETIC_ITALIC_FIELD]: z
+    .boolean()
+    .default(false)
+    .description("Refuse synthetic italic (stops CJK text from being tilted)"),
+  [NO_SYNTHETIC_BOLD_FIELD]: z
+    .boolean()
+    .default(false)
+    .description("Refuse synthetic bold (for faces without a real bold)"),
+  [shared.UI_FOLLOWS_FIELD]: z
+    .boolean()
+    .default(true)
     .description(
-      `Code font weight (${WEIGHT_MIN}..${WEIGHT_MAX}, ${WEIGHT_UNSET} keeps DSH's own weights; independent of the body weight)`
+      "The interface follows the conversation: its family and weight take the conversation's values (off = the interface keeps its own)"
     ),
+  [PER_THEME_FIELD]: z
+    .boolean()
+    .default(false)
+    .description("Keep a separate value set for the dark theme"),
+  [DARK_VALUES_FIELD]: z
+    .string()
+    .max(8000)
+    .default("{}")
+    .description("Dark theme sparse overrides (JSON map of axis field to value)"),
+  [shared.PRESETS_FIELD]: z
+    .string()
+    .max(20000)
+    .default("[]")
+    .description("Saved presets (JSON array of {name, values, savedAt})"),
+  [shared.ACTIVE_PRESET_FIELD]: z
+    .string()
+    .max(shared.MAX_PRESET_NAME)
+    .default("")
+    .description("Name of the preset the card currently edits (edits auto-save into it)"),
 });
 
 /**
@@ -116,7 +228,11 @@ export const Config = z.object({
  * @returns {StyleRow} the row the web server renders into `<head>`.
  */
 function styleRow(resolved) {
-  const text = buildFontCss(normalizeConfig(resolved), FALLBACK_TOKENS);
+  const cfg = normalizeConfig(resolved);
+  // 0.2.0 ships the per-theme editor out; light and dark stay one value set
+  // (the dark fields remain in the schema, dormant, for a future release).
+  cfg[PER_THEME_FIELD] = false;
+  const text = buildFontCss(cfg, FALLBACK_TOKENS);
   return { kind: "style", text };
 }