@akairos/typeset-studio 0.2.1 → 0.2.2

package/dist/index.html

@@ -11,7 +11,7 @@
       rel="stylesheet"
     />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/lxgw-wenkai-screen-web/style.css" />
-    <script type="module" crossorigin src="/assets/index-Dpnz-F2g.js"></script>
+    <script type="module" crossorigin src="/assets/index-DDeEGeHD.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CZ352D7X.css">
   </head>
   <body class="bg-[#fafafa] dark:bg-[#000000] text-[#171717] dark:text-[#ededed] antialiased selection:bg-[#eaeaea] selection:text-[#000000] dark:selection:bg-[#333333] dark:selection:text-[#ffffff] overflow-hidden">

package/dist/lib/adapter.js

@@ -67,22 +67,22 @@ function computeStageDimensions(spec, safeArea, contentBottomGap = 20) {
 function resolveCanvasFontFamily(fontName, isServer = false) {
   const rawFirst = (fontName || "").split(",")[0] || "";
   const trimmed = rawFirst.replace(/["'\\]/g, "").trim();
-  if (trimmed.includes("Noto Sans") || trimmed === "Noto Sans SC") {
+  if (trimmed.includes("Noto Sans")) {
     return isServer ? '"Hiragino Sans GB", sans-serif' : '"Noto Sans SC", "PingFang SC", sans-serif';
   }
-  if (trimmed.includes("PingFang") || trimmed === "PingFang SC") {
+  if (trimmed.includes("PingFang")) {
     return isServer ? '"Hiragino Sans GB", sans-serif' : '"PingFang SC", "Noto Sans SC", sans-serif';
   }
-  if (trimmed.includes("Noto Serif") || trimmed === "Noto Serif SC") {
+  if (trimmed.includes("Noto Serif")) {
     return isServer ? '"Songti SC", serif' : '"Noto Serif SC", "Songti SC", serif';
   }
-  if (trimmed.includes("Songti") || trimmed === "Songti SC" || trimmed === "STSong") {
+  if (trimmed.includes("Songti") || trimmed === "STSong") {
     return isServer ? '"Songti SC", serif' : '"Songti SC", "Noto Serif SC", serif';
   }
   if (trimmed.includes("Kai") || trimmed.includes("WenKai")) {
     return isServer ? '"STKaiti", "Kaiti SC", "Songti SC", serif' : '"LXGW WenKai GB Screen", "LXGW WenKai Screen", "Kaiti SC", "STKaiti", serif';
   }
-  if (trimmed.includes("Yuan") || trimmed.includes("Yuanti")) {
+  if (trimmed.includes("Yuan")) {
     return isServer ? '"STYuanti", "Yuanti SC", "Hiragino Sans GB", sans-serif' : '"Yuanti SC", "STYuanti", "PingFang SC", sans-serif';
   }
   if (trimmed.includes("Inter")) {
@@ -92,7 +92,7 @@ function resolveCanvasFontFamily(fontName, isServer = false) {
     return isServer ? 'Georgia, "Songti SC", serif' : 'Georgia, "Songti SC", serif';
   }
   if (trimmed.toLowerCase().includes("serif") || trimmed.includes("Song")) {
-    return isServer ? `"${trimmed}", "Songti SC", serif` : `"${trimmed}", "Songti SC", serif`;
+    return `"${trimmed}", "Songti SC", serif`;
   }
   return isServer ? `"${trimmed}", "Hiragino Sans GB", "PingFang SC", sans-serif` : `"${trimmed}", "PingFang SC", sans-serif`;
 }
@@ -114,14 +114,14 @@ async function drawPageToContext(ctx, options) {
   ctx.fillStyle = theme.bgColor;
   ctx.fillRect(0, 0, spec.width, spec.height);
   ctx.restore();
-  const { stageWidth, stageHeight, stageX, stageY } = computeStageDimensions(spec, algorithm.safeArea, algorithm.contentBottomGap);
+  const { stageX, stageY } = computeStageDimensions(spec, algorithm.safeArea, algorithm.contentBottomGap);
   const isCover = config.aspectRatio === "wechat-cover-2.35";
   const showHeader = chrome?.showHeader ?? !isCover;
   const showWatermark = (chrome?.showWatermark ?? !isCover) && Boolean(config.watermarkText?.trim());
   const showPageNum = (chrome?.showPageNumber ?? (!isCover && totalPageCount > 1)) && totalPageCount > 1;
   if (showHeader && (showWatermark || showPageNum)) {
     const headerY = Math.max(24, Math.floor(algorithm.safeArea.top * 0.45));
-    if (showWatermark && config.watermarkText?.trim()) {
+    if (showWatermark) {
       ctx.save();
       ctx.font = resolveCanvasFont("600 14px PingFang SC", isServer);
       ctx.fillStyle = theme.watermarkColor;
@@ -265,7 +265,7 @@ async function drawPageToContext(ctx, options) {
       ctx.stroke();
       ctx.restore();
     }
-    if (showFooterText && config.footerText?.trim()) {
+    if (showFooterText) {
       ctx.save();
       ctx.font = resolveCanvasFont("500 13px PingFang SC", isServer);
       ctx.fillStyle = theme.watermarkColor || theme.captionColor;
@@ -6004,6 +6004,7 @@ function materializeRichInlineLineRange(prepared, line) {
     end: line.end
   };
 }
+
 // src/core/pretext.ts
 var initialized = false;
 function ensurePretextRuntime() {
@@ -6583,21 +6584,21 @@ function runTypeset(params) {
     headingFont: config.typography.headingFont,
     bodyFont: config.typography.bodyFont
   });
+  const createFlowBlocks = (text) => parseContentBlocks(text).map((block) => ({
+    ...blockStyles[block.kind],
+    kind: block.kind,
+    text: block.text,
+    runs: parseInlineRuns(block.text, highlightWords),
+    bullet: block.kind === "list-item" ? block.bullet ?? "•" : undefined,
+    textIndent: block.kind === "list-item" ? 28 : block.kind === "quote" ? 20 : 0,
+    keepWithNext: ["heading", "subheading", "minor-heading"].includes(block.kind)
+  }));
   const pageSegments = splitTextByPages(markdown);
   let pages = [];
   if (pageSegments.length > 1) {
     pages = pageSegments.map((segmentText, index) => {
       const pageNum = index + 1;
-      const rawBlocks = parseContentBlocks(segmentText);
-      const flowBlocks = rawBlocks.map((b) => ({
-        ...blockStyles[b.kind],
-        kind: b.kind,
-        text: b.text,
-        runs: parseInlineRuns(b.text, highlightWords),
-        bullet: b.kind === "list-item" ? b.bullet ?? "•" : undefined,
-        textIndent: b.kind === "list-item" ? 28 : b.kind === "quote" ? 20 : 0,
-        keepWithNext: ["heading", "subheading", "minor-heading"].includes(b.kind)
-      }));
+      const flowBlocks = createFlowBlocks(segmentText);
       const pageImages = images.filter((img) => {
         if (img.pageIndex !== undefined && img.pageIndex !== null && img.pageIndex > 0) {
           return img.pageIndex === pageNum;
@@ -6624,16 +6625,7 @@ function runTypeset(params) {
       };
     });
   } else {
-    const rawBlocks = parseContentBlocks(markdown);
-    const flowBlocks = rawBlocks.map((b) => ({
-      ...blockStyles[b.kind],
-      kind: b.kind,
-      text: b.text,
-      runs: parseInlineRuns(b.text, highlightWords),
-      bullet: b.kind === "list-item" ? b.bullet ?? "•" : undefined,
-      textIndent: b.kind === "list-item" ? 28 : b.kind === "quote" ? 20 : 0,
-      keepWithNext: ["heading", "subheading", "minor-heading"].includes(b.kind)
-    }));
+    const flowBlocks = createFlowBlocks(markdown);
     pages = paginateBlocks(flowBlocks, stageWidth, stageHeight, images, {
       obstacleGap: config.algorithm.obstacleGap,
       pageImageLimit: config.aspectRatio === "longform-3-4" ? 2 : 1,
@@ -7132,6 +7124,7 @@ function findTemplateByKeyOrName(key) {
     } catch {}
   }
   const files = readdirSync2(TEMPLATES_DIR).filter((f) => f.endsWith(".json"));
+  const templates = [];
   for (const file of files) {
     try {
       const content = readFileSync2(join3(TEMPLATES_DIR, file), "utf-8");
@@ -7139,18 +7132,10 @@ function findTemplateByKeyOrName(key) {
       if (tpl.id?.toLowerCase() === lowerKey || tpl.name.toLowerCase() === lowerKey) {
         return tpl;
       }
+      templates.push(tpl);
     } catch {}
   }
-  for (const file of files) {
-    try {
-      const content = readFileSync2(join3(TEMPLATES_DIR, file), "utf-8");
-      const tpl = JSON.parse(content);
-      if (tpl.name.toLowerCase().includes(lowerKey)) {
-        return tpl;
-      }
-    } catch {}
-  }
-  return null;
+  return templates.find((tpl) => tpl.name.toLowerCase().includes(lowerKey)) ?? null;
 }
 var templatesRouter = new Hono3;
 templatesRouter.get("/", (c) => {
@@ -7442,7 +7427,7 @@ function mapBodyImages(bodyImages, pageSpecs) {
   });
 }
 var REMOTE_STUDIO_URL = process.env.TYPESET_STUDIO_URL?.replace(/\/$/, "");
-async function renderRemoteBatch(studioUrl, body, outputDir, filenamePrefix, route, kind) {
+async function renderRemoteBatch(studioUrl, body, outputDir, route, kind) {
   const res = await fetch(`${studioUrl}/api/render/export`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -7454,12 +7439,11 @@ async function renderRemoteBatch(studioUrl, body, outputDir, filenamePrefix, rou
   const data = await res.json();
   const assets = [];
   const pagesSummary = [];
-  for (let i = 0;i < data.pages.length; i++) {
-    const pageItem = data.pages[i];
+  for (const pageItem of data.pages) {
     const pageNum = pageItem.pageNumber;
     const base64Data = pageItem.dataUrl.replace(/^data:image\/png;base64,/, "");
     const buffer = Buffer.from(base64Data, "base64");
-    const filename = kind === "cover" ? "cover.png" : `${filenamePrefix}-${String(pageNum).padStart(2, "0")}.png`;
+    const filename = kind === "cover" ? "cover.png" : `article-${String(pageNum).padStart(2, "0")}.png`;
     const filePath = join4(outputDir, filename);
     await writeFile(filePath, buffer);
     assets.push({
@@ -7476,9 +7460,33 @@ async function renderRemoteBatch(studioUrl, body, outputDir, filenamePrefix, rou
   }
   return { assets, pageCount: data.pageCount, pages: pagesSummary };
 }
+async function renderLocalBatch(body, outputDir, route, kind) {
+  const { result } = resolveTypesetResult(body);
+  const pngs = await renderTypesetResultToPngs(result);
+  const outputs = kind === "cover" ? pngs.slice(0, 1) : pngs;
+  if (kind === "cover" && outputs.length === 0) {
+    throw new Error("Typeset Studio failed to render cover buffer");
+  }
+  const assets = [];
+  const pages = [];
+  for (const [index, output] of outputs.entries()) {
+    const pageNumber = index + 1;
+    const filename = kind === "cover" ? "cover.png" : `article-${String(pageNumber).padStart(2, "0")}.png`;
+    const path = join4(outputDir, filename);
+    await writeFile(path, output.buffer);
+    assets.push({ kind, route, path, ...kind === "page" ? { index: pageNumber } : {} });
+    const images = result.pages[index].images;
+    pages.push({
+      page: pageNumber,
+      imageCount: images.length,
+      imageSources: images.map((image) => image.src)
+    });
+  }
+  return { assets, pageCount: outputs.length, pages };
+}
 var typesetStudioAdapter = {
   name: "typeset-studio",
-  version: "0.2.1",
+  version: "0.2.2",
   async doctor() {
     const checks = [];
     if (REMOTE_STUDIO_URL) {
@@ -7512,7 +7520,7 @@ var typesetStudioAdapter = {
     } catch (err) {
       checks.push({
         name: "@napi-rs/canvas",
-        ok: !REMOTE_STUDIO_URL,
+        ok: Boolean(REMOTE_STUDIO_URL),
         message: REMOTE_STUDIO_URL ? "@napi-rs/canvas not installed locally (using Cloud Typeset Studio microservice)" : `@napi-rs/canvas initialization failed: ${err}`
       });
     }
@@ -7533,201 +7541,41 @@ var typesetStudioAdapter = {
     return checks;
   },
   async render(input) {
-    const { route, outputDir, title, bodyText, state } = input;
+    const { route, outputDir, bodyText, state } = input;
     await mkdir(outputDir, { recursive: true });
+    if (route === "blog")
+      return { assets: [], pageCount: 0, pages: [] };
     const account = state.route.account || "default";
-    const highlightWords = state.route.highlight_words || [];
-    const footerText = input.accountVisualParams?.footer;
-    const watermarkText = account ? `@${account}` : undefined;
-    const effectiveTitle = cleanTitle(title || state.metadata?.title || "");
-    if (REMOTE_STUDIO_URL) {
-      if (route === "wechat-article") {
-        const coverImages2 = mapBodyImages(input.bodyImages, input.pageSpecs);
-        return await renderRemoteBatch(REMOTE_STUDIO_URL, {
-          slot: "article_cover",
-          route: "wechat-article",
-          account,
-          title: effectiveTitle,
-          markdown: `# ${effectiveTitle}`,
-          template: input.template,
-          images: coverImages2,
-          highlightWords,
-          config: { footerText, watermarkText }
-        }, outputDir, "cover", "wechat-article", "cover");
-      }
-      if (route === "wechat-newspic") {
-        const newspicSpec2 = state.intent?.newspic_render;
-        const paginationMode2 = input.template === "longform-3-4" ? "multi" : input.template === "poster-3-4" ? "single" : newspicSpec2?.pagination_mode || "multi";
-        const isMultiPage2 = paginationMode2 === "multi";
-        const coverImages2 = mapBodyImages(input.bodyImages, input.pageSpecs);
-        const coverRes = await renderRemoteBatch(REMOTE_STUDIO_URL, {
-          slot: "newspic_cover",
-          route: "wechat-newspic",
-          kind: "cover",
-          account,
-          title: effectiveTitle,
-          markdown: `# ${effectiveTitle}`,
-          template: input.template,
-          images: coverImages2,
-          highlightWords,
-          config: { footerText, watermarkText }
-        }, outputDir, "cover", "wechat-newspic", "cover");
-        if (!isMultiPage2) {
-          return coverRes;
-        }
-        const contentImages2 = mapBodyImages(input.bodyImages, input.pageSpecs);
-        const contentRes = await renderRemoteBatch(REMOTE_STUDIO_URL, {
-          slot: "newspic_content",
-          route: "wechat-newspic",
-          kind: "content",
-          account,
-          title: effectiveTitle,
-          markdown: bodyText || `# ${effectiveTitle}`,
-          template: input.template,
-          images: contentImages2,
-          highlightWords,
-          config: { footerText, watermarkText }
-        }, outputDir, "article", "wechat-newspic", "page");
-        return {
-          assets: [...coverRes.assets, ...contentRes.assets],
-          pageCount: contentRes.pageCount,
-          pages: contentRes.pages
-        };
-      }
-    }
-    if (route === "wechat-article") {
-      const coverImages2 = mapBodyImages(input.bodyImages, input.pageSpecs);
-      const resolved = resolveTypesetResult({
-        slot: "article_cover",
-        route: "wechat-article",
-        account,
-        title: effectiveTitle,
-        markdown: `# ${effectiveTitle}`,
-        template: input.template,
-        images: coverImages2,
-        highlightWords,
-        config: {
-          footerText: footerText ?? undefined,
-          watermarkText: watermarkText ?? undefined
-        }
-      });
-      const pngOutputs = await renderTypesetResultToPngs(resolved.result);
-      const coverBuffer2 = pngOutputs[0]?.buffer;
-      if (!coverBuffer2) {
-        throw new Error("Typeset Studio failed to render cover buffer");
-      }
-      const coverPath2 = join4(outputDir, "cover.png");
-      await writeFile(coverPath2, coverBuffer2);
-      const asset = {
-        kind: "cover",
-        route: "wechat-article",
-        path: coverPath2
-      };
-      return {
-        assets: [asset],
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolved.result.pages[0]?.images.length || 0,
-            imageSources: (resolved.result.pages[0]?.images || []).map((img) => img.src)
-          }
-        ]
-      };
-    }
-    if (route === "blog") {
-      return {
-        assets: [],
-        pageCount: 0,
-        pages: []
-      };
-    }
-    const newspicSpec = state.intent?.newspic_render;
-    const paginationMode = input.template === "longform-3-4" ? "multi" : input.template === "poster-3-4" ? "single" : newspicSpec?.pagination_mode || "multi";
-    const isMultiPage = paginationMode === "multi";
-    const assets = [];
-    const pagesSummary = [];
-    const coverImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedCover = resolveTypesetResult({
-      slot: "newspic_cover",
-      route: "wechat-newspic",
-      kind: "cover",
+    const title = cleanTitle(input.title || state.metadata?.title || "");
+    const common = {
       account,
-      title: effectiveTitle,
-      markdown: `# ${effectiveTitle}`,
+      title,
       template: input.template,
-      images: coverImages,
-      highlightWords,
-      config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined
-      }
-    });
-    const coverPngs = await renderTypesetResultToPngs(resolvedCover.result);
-    const coverBuffer = coverPngs[0]?.buffer;
-    if (!coverBuffer) {
-      throw new Error("Typeset Studio failed to render newspic cover buffer");
-    }
-    const coverPath = join4(outputDir, "cover.png");
-    await writeFile(coverPath, coverBuffer);
-    assets.push({
-      kind: "cover",
-      route: "wechat-newspic",
-      path: coverPath
-    });
-    if (!isMultiPage) {
-      return {
-        assets,
-        pageCount: 1,
-        pages: [
-          {
-            page: 1,
-            imageCount: resolvedCover.result.pages[0]?.images.length || 0,
-            imageSources: (resolvedCover.result.pages[0]?.images || []).map((img) => img.src)
-          }
-        ]
-      };
-    }
-    const contentImages = mapBodyImages(input.bodyImages, input.pageSpecs);
-    const resolvedContent = resolveTypesetResult({
-      slot: "newspic_content",
+      images: mapBodyImages(input.bodyImages, input.pageSpecs),
+      highlightWords: state.route.highlight_words || [],
+      config: { footerText: input.accountVisualParams?.footer, watermarkText: `@${account}` }
+    };
+    const articleCover = route === "wechat-article";
+    const renderRoute = articleCover ? "wechat-article" : "wechat-newspic";
+    const renderBatch = (body, kind) => REMOTE_STUDIO_URL && (route === "wechat-article" || route === "wechat-newspic") ? renderRemoteBatch(REMOTE_STUDIO_URL, body, outputDir, renderRoute, kind) : renderLocalBatch(body, outputDir, renderRoute, kind);
+    const cover = await renderBatch({
+      ...common,
+      route: renderRoute,
+      slot: articleCover ? "article_cover" : "newspic_cover",
+      ...articleCover ? {} : { kind: "cover" },
+      markdown: `# ${title}`
+    }, "cover");
+    const paginationMode = input.template === "longform-3-4" ? "multi" : input.template === "poster-3-4" ? "single" : state.intent?.newspic_render?.pagination_mode || "multi";
+    if (articleCover || paginationMode !== "multi")
+      return cover;
+    const content = await renderBatch({
+      ...common,
       route: "wechat-newspic",
       kind: "content",
-      account,
-      title: effectiveTitle,
-      markdown: bodyText || `# ${effectiveTitle}`,
-      template: input.template,
-      images: contentImages,
-      highlightWords,
-      config: {
-        footerText: footerText ?? undefined,
-        watermarkText: watermarkText ?? undefined
-      }
-    });
-    const contentPngs = await renderTypesetResultToPngs(resolvedContent.result);
-    for (let i = 0;i < contentPngs.length; i++) {
-      const pageNum = i + 1;
-      const fileName = `article-${String(pageNum).padStart(2, "0")}.png`;
-      const pagePath = join4(outputDir, fileName);
-      await writeFile(pagePath, contentPngs[i].buffer);
-      assets.push({
-        kind: "page",
-        route: "wechat-newspic",
-        index: pageNum,
-        path: pagePath
-      });
-      const flowPage = resolvedContent.result.pages[i];
-      pagesSummary.push({
-        page: pageNum,
-        imageCount: flowPage?.images.length || 0,
-        imageSources: (flowPage?.images || []).map((img) => img.src)
-      });
-    }
-    return {
-      assets,
-      pageCount: contentPngs.length,
-      pages: pagesSummary
-    };
+      slot: "newspic_content",
+      markdown: bodyText || `# ${title}`
+    }, "page");
+    return { ...content, assets: [...cover.assets, ...content.assets] };
   }
 };
 var plugin = typesetStudioAdapter;