@lutrin/core 1.0.0 → 1.1.1

package/src/pptx/render.mjs

@@ -33,8 +33,9 @@ import {
 import { ALERT_BLOCK_TYPES, runsToText } from '../deck/parse.mjs';
 import {
   fetchRemoteImage,
+  iconSvg,
+  ICON_RASTER_PX,
   imageDims,
-  renderIcon,
   renderMath,
   renderMermaidCached,
   rasterAvailable,
@@ -151,7 +152,12 @@ function addPara(slide, block, r) {
     color: block.color ?? COLORS.neutralPrimary,
     align: 'left',
     valign: 'top',
-    lineSpacingMultiple: LINE_HEIGHT,
+    // exact points, never a multiple: OOXML's spcPct multiplies the FONT'S
+    // own line metrics, so a kit font with tall ascenders rendered ~20%
+    // taller than blockHeight() measured and crowded whatever followed.
+    // spcPts pins the pitch to what the layout engine and the HTML (.para
+    // line-height 1.4) both assume, whatever font the kit ships.
+    lineSpacing: TYPE.body * LINE_HEIGHT,
   });
 }
 
@@ -168,8 +174,9 @@ function addHeading(slide, block, r) {
     bold: true,
     valign: 'top',
     ...(block.align ? { align: block.align } : {}),
-    // multi-line message: same line height as the CSS .slot-heading (1.3)
-    ...(block.size ? { lineSpacingMultiple: 1.3 } : {}),
+    // multi-line message: same line height as the CSS .slot-heading (1.3),
+    // in exact points (spcPts) — see addPara on why never a multiple
+    ...(block.size ? { lineSpacing: block.size * 1.3 } : {}),
   });
 }
 
@@ -194,6 +201,13 @@ function addBullets(slide, block, r) {
         options: { fontFace: FONTS.body, color: block.color ?? COLORS.neutralPrimary },
       });
     }
+    if (it.level) {
+      // nested items: same size and pitch as the HTML (.bullets ul ul)
+      itemRuns.forEach((run) => {
+        run.options.fontSize = TYPE.bulletNested;
+      });
+      itemRuns[0].options.lineSpacing = TYPE.bulletNested * 1.3;
+    }
     itemRuns[0] = {
       ...itemRuns[0],
       options: {
@@ -222,8 +236,10 @@ function addBullets(slide, block, r) {
     fontFace: FONTS.body,
     color: block.color ?? COLORS.neutralPrimary,
     valign: 'top',
-    lineSpacingMultiple: 1.25,
-    paraSpaceAfter: 6,
+    // exact pitch and gap of the HTML (.bullets: line-height 1.3, li
+    // margin-bottom 6px) — spcPts + 4.5 pt (= 6 px); see addPara
+    lineSpacing: TYPE.bullet * 1.3,
+    paraSpaceAfter: 4.5,
   });
 }
 
@@ -259,7 +275,8 @@ function addCode(slide, block, r) {
     h: px(r.h - 2 * SPACE.xs),
     fontSize: TYPE.code,
     valign: 'top',
-    lineSpacingMultiple: 1.25,
+    // exact pitch of the HTML (.code line-height 1.3); see addPara
+    lineSpacing: TYPE.code * 1.3,
   });
 }
 
@@ -308,7 +325,13 @@ function addAlert(slide, block, r) {
   const runs = [
     {
       text: sem.label,
-      options: { bold: true, fontSize: TYPE.small, color: sem.text, breakLine: true },
+      options: {
+        bold: true,
+        fontSize: TYPE.small,
+        color: sem.text,
+        breakLine: true,
+        lineSpacing: TYPE.small * 1.3,
+      },
     },
   ];
   // outside ALERT_BLOCK_TYPES: ignored (height not reserved by blockHeight,
@@ -336,7 +359,9 @@ function addAlert(slide, block, r) {
     fontSize: TYPE.body,
     fontFace: FONTS.body,
     valign: 'top',
-    lineSpacingMultiple: 1.3,
+    // exact pitch of the HTML (.alert line-height 1.3); the label paragraph
+    // carries its own smaller pitch in its run options — see addPara
+    lineSpacing: TYPE.body * 1.3,
   });
 }
 
@@ -522,7 +547,8 @@ function addQuote(slide, block, r) {
     color: COLORS.neutralPrimary,
     fontFace: FONTS.body,
     valign: 'middle',
-    lineSpacingMultiple: LINE_HEIGHT,
+    // exact pitch of the HTML (.quote blockquote line-height 1.4); see addPara
+    lineSpacing: TYPE.quote * LINE_HEIGHT,
   });
   if (block.cite) {
     slide.addText(`— ${block.cite}`, {
@@ -598,7 +624,7 @@ function addMermaid(slide, block, r, ctx) {
   }
   // faithful fallback: source shown as a code block plus a caption
   addCode(slide, { type: 'code', lang: 'mermaid', source: block.source }, { ...r, h: r.h - 24 });
-  slide.addText('Mermaid diagram — install @mermaid-js/mermaid-cli for graphical rendering', {
+  slide.addText('Mermaid diagram — run `lutrin setup-mermaid` for graphical rendering', {
     x: px(r.x),
     y: px(r.y + r.h - 22),
     w: px(r.w),
@@ -922,6 +948,9 @@ function renderCover(pptx, scene) {
     bold: true,
     color: COLORS.neutralPrimary,
     fontFace: FONTS.body,
+    // explicit: a paragraph without `algn` inherits the master's titleStyle,
+    // which PptxGenJS hard-codes centered — the HTML output is left-aligned
+    align: 'left',
     valign: 'top',
   });
   if (LOGOS.cover && fs.existsSync(LOGOS.cover)) {
@@ -975,6 +1004,7 @@ function renderSection(pptx, scene) {
     bold: true,
     color: COLORS.ground,
     fontFace: FONTS.body,
+    align: 'left', // same inheritance trap as the cover title
     valign: 'middle',
   });
   if (LOGOS.section && fs.existsSync(LOGOS.section)) {
@@ -1203,13 +1233,20 @@ async function renderDeckTo(scenes, meta, baseDir, outPath, tmp, opts = {}) {
   const iconWarnings = new Array(iconBlocks.length);
   await Promise.all(
     iconBlocks.map(async (b, k) => {
-      const out = await renderIcon(b.name, { color: b.color });
-      if (!out) {
+      // two failures, two diagnostics: an icon whose SVG cannot be FOUND is a
+      // deck problem (typo, package absent, offline), while an SVG found but
+      // not RASTERIZED is the missing resvg binary — already reported, with
+      // its remedy, by RASTER_UNAVAILABLE below. Conflating them sent Windows
+      // users hunting for a network problem when their VSIX simply shipped
+      // another platform's rasterizer.
+      const svg = await iconSvg(b.name, { color: b.color });
+      if (!svg) {
         iconWarnings[k] =
           `Icon "${iconLabel(b.name)}" not found — name unknown to Lucide, or the lucide-static package is absent and there is no network. The slide is rendered without it.`;
         return;
       }
-      icons.set(b, writeTmpPng(tmp(), `icon-${k}-${iconSlug(b.name)}`, out.png));
+      const out = await svgToPng(svg, ICON_RASTER_PX);
+      if (out) icons.set(b, writeTmpPng(tmp(), `icon-${k}-${iconSlug(b.name)}`, out.png));
     }),
   );
   const assetWarnings = iconWarnings.filter(Boolean);
@@ -1310,6 +1347,7 @@ async function renderDeckTo(scenes, meta, baseDir, outPath, tmp, opts = {}) {
           bold: true,
           color: COLORS.neutralPrimary,
           fontFace: FONTS.body,
+          align: 'left', // same inheritance trap as the cover title
           valign: 'middle',
         },
       );

package/vendor/mermaid/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 - 2022 Knut Sveidqvist
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/vendor/mermaid/README.md

@@ -0,0 +1,44 @@
+# Vendored Mermaid
+
+`mermaid.min.js` — the standalone UMD bundle of [Mermaid](https://mermaid.js.org),
+copied verbatim from the npm package. MIT, see `LICENSE`.
+
+| | |
+|---|---|
+| Version | 11.16.0 |
+| Source | `mermaid@11.16.0/dist/mermaid.min.js` |
+| SHA-256 | `74d7c46dabca328c2294733910a8aa1ed0c37451776e8d5295da38a2b758fb9b` |
+
+## Why a copy in the repository rather than a dependency
+
+Mermaid needs a browser: it measures the text it lays out, so it cannot render
+without a layout engine. The two obvious ways to get one both cost far more
+than this file:
+
+- `@mermaid-js/mermaid-cli` pulls Puppeteer, which downloads a Chrome — 405 MB
+  of `node_modules` plus ~540 MB of browser, measured, on every install. That is
+  what made mermaid-cli an optional peer dependency nobody installs, and
+  therefore what made diagrams silently degrade to a text fallback on a fresh
+  machine.
+- Depending on `mermaid` itself installs 83 MB, of which 56 MB are source maps.
+  We load exactly one file out of it.
+
+So we take the one file. `browser.mjs` finds a browser already on the machine
+and `mermaid-render.mjs` loads this bundle into it; `@resvg/resvg-js`, already a
+dependency, turns the SVG into the PNG the .pptx needs.
+
+## Upgrading
+
+Version-bumping is a copy, and the two version markers must move together:
+
+```sh
+npm pack mermaid@<version>          # or npm i mermaid@<version> in a scratch dir
+cp .../mermaid/dist/mermaid.min.js packages/core/vendor/mermaid/
+shasum -a 256 packages/core/vendor/mermaid/mermaid.min.js
+```
+
+Then update the table above, the `@mermaid-js/mermaid-cli` peer range in
+`packages/core/package.json` (kept in step so both rendering paths speak the
+same Mermaid dialect), and `THIRD-PARTY-NOTICES.md`. `test/mermaid.test.mjs`
+asserts the bundle is present and that its recorded SHA-256 matches, so a
+half-finished upgrade fails the suite rather than shipping.