@file-viewer/renderer-typst 2.0.11 → 2.1.0

package/README.en.md

@@ -31,7 +31,7 @@ const options = {
 - Supports `.typ` and `.typst`.
 - Compiles Typst source in the browser and renders SVG pages.
 - Preserves page size metadata for preview, zoom, print, and HTML export.
-- Supports `options.typst.renderTimeoutMs` for long-running documents.
+- Supports `options.typst.renderTimeoutMs` for slow asset loading and long-running documents.
 - Reports clear diagnostics for missing WASM assets, wrong MIME types, network failures, and Typst compile errors.
 
 ## Offline Assets
@@ -40,8 +40,9 @@ The default asset paths are:
 
 - `wasm/typst/typst_ts_web_compiler_bg.wasm`
 - `wasm/typst/typst_ts_renderer_bg.wasm`
+- `wasm/typst/fonts/`
 
-For private deployments, override them with `options.typst.compilerWasmUrl` and `options.typst.rendererWasmUrl`. The runtime does not depend on public CDNs.
+For private deployments, override them with `options.typst.compilerWasmUrl`, `options.typst.rendererWasmUrl`, and `options.typst.fontAssetsUrl`. The default text fonts ship with this package and are copied by `file-viewer-copy-assets` / `@file-viewer/vite-plugin`, so the runtime does not depend on public CDNs.
 
 ## Migration Note
 

package/README.md

@@ -31,7 +31,7 @@ const options = {
 - 支持 `.typ`、`.typst`。
 - 浏览器端真实编译 Typst 源文件并输出 SVG 页面。
 - 支持页面尺寸识别、缩放、打印和 HTML 导出。
-- 支持 `options.typst.renderTimeoutMs` 编译超时控制。
+- 支持 `options.typst.renderTimeoutMs` 加载 / 编译超时控制。
 - WASM 缺失、MIME 错误、网络错误或编译错误会给出明确诊断。
 
 ## 离线资产
@@ -40,8 +40,9 @@ const options = {
 
 - `wasm/typst/typst_ts_web_compiler_bg.wasm`
 - `wasm/typst/typst_ts_renderer_bg.wasm`
+- `wasm/typst/fonts/`
 
-私有化部署时可以通过 `options.typst.compilerWasmUrl` 和 `options.typst.rendererWasmUrl` 覆盖。预览运行时不会访问公共 CDN。
+私有化部署时可以通过 `options.typst.compilerWasmUrl`、`options.typst.rendererWasmUrl` 和 `options.typst.fontAssetsUrl` 覆盖。默认字体资产随本包发布并由 `file-viewer-copy-assets` / `@file-viewer/vite-plugin` 复制到本地静态目录，预览运行时不会访问公共 CDN。
 
 ## 迁移说明
 

package/assets/fonts/README.md

@@ -0,0 +1,7 @@
+# Typst Font Assets
+
+This directory vendors the default `text` font assets used by `@myriaddreamin/typst.ts`.
+
+Source: `typst-assets@v0.13.1`, `files/fonts/`
+
+The files are copied into `wasm/typst/fonts/` by File Viewer asset tooling so Typst previews do not fetch fonts from public CDNs at runtime. Keep the filenames stable because `typst.ts` resolves them by name.

package/dist/typst.d.ts

@@ -2,6 +2,7 @@ import { type FileRenderContext, type FileViewerRenderedInstance } from '@file-v
 declare global {
     interface Window {
         __FLYFISH_TYPST_COMPILER_WASM_URL__?: string;
+        __FLYFISH_TYPST_FONT_ASSETS_URL__?: string;
         __FLYFISH_TYPST_RENDERER_WASM_URL__?: string;
     }
 }

package/dist/typst.js

@@ -1,5 +1,6 @@
-import { $typst } from '@myriaddreamin/typst.ts';
-import { resolveFileViewerTypstCompilerWasmUrl, resolveFileViewerTypstRendererWasmUrl, } from '@file-viewer/core/assets';
+import { $typst, MemoryAccessModel } from '@myriaddreamin/typst.ts';
+import { TypstSnippet } from '@myriaddreamin/typst.ts/contrib/snippet';
+import { resolveFileViewerTypstCompilerWasmUrl, resolveFileViewerTypstFontAssetsUrl, resolveFileViewerTypstRendererWasmUrl, } from '@file-viewer/core/assets';
 import { createFileViewerZoomChangeEmitter, formatCssPixels, registerFileViewerZoomProvider, readFileViewerText, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
 const typstStyle = `
 .typst-viewer{min-height:100%;overflow:auto;background:#eef1f4;color:#172033}
@@ -30,10 +31,10 @@ const typstStyle = `
 @media (prefers-color-scheme:dark){.file-viewer[data-viewer-theme='system'] .typst-viewer{background:#101820;color:#e6edf3}.file-viewer[data-viewer-theme='system'] .typst-toolbar{border-bottom-color:rgba(139,148,158,.22);background:rgba(15,23,42,.9)}.file-viewer[data-viewer-theme='system'] .typst-toolbar strong{color:#f8fafc}.file-viewer[data-viewer-theme='system'] .typst-toolbar span,.file-viewer[data-viewer-theme='system'] .typst-toolbar em{color:#9aa7b8}.file-viewer[data-viewer-theme='system'] .typst-page-shell{border-color:rgba(139,148,158,.26);box-shadow:0 24px 56px rgba(0,0,0,.38)}.file-viewer[data-viewer-theme='system'] .typst-loading,.file-viewer[data-viewer-theme='system'] .typst-error{border-color:rgba(139,148,158,.22);background:#151b23;box-shadow:0 24px 56px rgba(0,0,0,.32)}.file-viewer[data-viewer-theme='system'] .typst-loading strong,.file-viewer[data-viewer-theme='system'] .typst-error strong{color:#f8fafc}}
 `;
 let typstEngineConfigKey = '';
-const DEFAULT_TYPST_RENDER_TIMEOUT_MS = 60000;
+const DEFAULT_TYPST_RENDER_TIMEOUT_MS = 180000;
 class TypstRenderTimeoutError extends Error {
     constructor(timeoutMs) {
-        super(`Typst 编译超过 ${Math.round(timeoutMs / 1000)} 秒`);
+        super(`Typst WASM / 字体加载或编译超过 ${Math.round(timeoutMs / 1000)} 秒`);
         this.name = 'TypstRenderTimeoutError';
     }
 }
@@ -58,11 +59,21 @@ const getWindowOverride = (key) => {
     }
     return window[key];
 };
-const configureTypstEngine = (compilerWasmUrl, rendererWasmUrl) => {
-    const configKey = `${compilerWasmUrl}\n${rendererWasmUrl}`;
+const configureTypstEngine = (compilerWasmUrl, rendererWasmUrl, fontAssetsUrl) => {
+    const normalizedFontAssetsUrl = fontAssetsUrl.endsWith('/') ? fontAssetsUrl : `${fontAssetsUrl}/`;
+    const configKey = `${compilerWasmUrl}\n${rendererWasmUrl}\n${normalizedFontAssetsUrl}`;
     if (typstEngineConfigKey === configKey) {
         return;
     }
+    // typst.ts otherwise installs public registry/font fetchers. File Viewer keeps
+    // Typst deterministic for enterprise/offline deployments by pinning both.
+    $typst.use(TypstSnippet.withAccessModel(new MemoryAccessModel()), TypstSnippet.preloadFontAssets({
+        assets: ['text'],
+        assetUrlPrefix: {
+            text: normalizedFontAssetsUrl,
+            _: normalizedFontAssetsUrl,
+        },
+    }));
     $typst.setCompilerInitOptions({
         getModule: () => compilerWasmUrl,
     });
@@ -73,6 +84,7 @@ const configureTypstEngine = (compilerWasmUrl, rendererWasmUrl) => {
 };
 const pushUniqueTypstCandidate = (candidates, candidate) => {
     if (candidates.some(item => item.compilerWasmUrl === candidate.compilerWasmUrl &&
+        item.fontAssetsUrl === candidate.fontAssetsUrl &&
         item.rendererWasmUrl === candidate.rendererWasmUrl)) {
         return;
     }
@@ -82,20 +94,27 @@ const resolveTypstEngineCandidates = (context, documentBaseUrl) => {
     var _a;
     const typstOptions = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.typst;
     const compilerOverride = getWindowOverride('__FLYFISH_TYPST_COMPILER_WASM_URL__');
+    const fontAssetsOverride = getWindowOverride('__FLYFISH_TYPST_FONT_ASSETS_URL__');
     const rendererOverride = getWindowOverride('__FLYFISH_TYPST_RENDERER_WASM_URL__');
     const compilerWasmUrl = resolveFileViewerTypstCompilerWasmUrl(typstOptions, [
         compilerOverride,
     ], documentBaseUrl);
+    const fontAssetsUrl = resolveFileViewerTypstFontAssetsUrl(typstOptions, [
+        fontAssetsOverride,
+    ], documentBaseUrl);
     const rendererWasmUrl = resolveFileViewerTypstRendererWasmUrl(typstOptions, [
         rendererOverride,
     ], documentBaseUrl);
     const hasConfiguredAsset = Boolean((typstOptions === null || typstOptions === void 0 ? void 0 : typstOptions.compilerWasmUrl) ||
+        (typstOptions === null || typstOptions === void 0 ? void 0 : typstOptions.fontAssetsUrl) ||
         (typstOptions === null || typstOptions === void 0 ? void 0 : typstOptions.rendererWasmUrl) ||
         compilerOverride ||
+        fontAssetsOverride ||
         rendererOverride);
     const candidates = [];
     pushUniqueTypstCandidate(candidates, {
         compilerWasmUrl,
+        fontAssetsUrl,
         rendererWasmUrl,
         source: hasConfiguredAsset ? 'configured' : 'local',
         preflight: !hasConfiguredAsset,
@@ -232,13 +251,13 @@ const formatTypstRuntimeError = (error) => {
     if (error instanceof TypstRenderTimeoutError) {
         return [
             message,
-            '请检查 Typst 源文件复杂度，或通过 options.typst.renderTimeoutMs 调大浏览器端编译超时。'
+            '请检查 Typst compiler WASM、renderer WASM、字体目录的下载速度和缓存策略；弱网或跨境部署可通过 options.typst.renderTimeoutMs 调大浏览器端加载/编译超时。'
         ].join('\n\n');
     }
     if (isTypstAssetLoadError(error)) {
         return [
             message,
-            'Typst 需要本地 compiler / renderer WASM。请运行 file-viewer-copy-assets，或配置 options.typst.compilerWasmUrl / options.typst.rendererWasmUrl，并确认服务器以 application/wasm 返回资源。'
+            'Typst 需要本地 compiler / renderer WASM 和字体目录。请运行 file-viewer-copy-assets，或配置 options.typst.compilerWasmUrl / options.typst.rendererWasmUrl / options.typst.fontAssetsUrl，并确认服务器以 application/wasm 返回 WASM。'
         ].join('\n\n');
     }
     return message;
@@ -481,7 +500,7 @@ export default async function renderTypst(buffer, target, _type, context) {
                 continue;
             }
             try {
-                configureTypstEngine(candidate.compilerWasmUrl, candidate.rendererWasmUrl);
+                configureTypstEngine(candidate.compilerWasmUrl, candidate.rendererWasmUrl, candidate.fontAssetsUrl);
                 return await withRenderTimeout($typst.svg({
                     mainContent: source,
                     data_selection: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-typst",
-  "version": "2.0.11",
+  "version": "2.1.0",
   "private": false,
   "type": "module",
   "description": "Standalone Typst renderer plugin for Flyfish File Viewer powered by browser WASM.",
@@ -47,13 +47,14 @@
     "./package.json": "./package.json"
   },
   "files": [
+    "assets",
     "dist",
     "README.md",
     "README.en.md",
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "^2.0.11",
+    "@file-viewer/core": "^2.1.0",
     "@myriaddreamin/typst-ts-renderer": "0.7.0",
     "@myriaddreamin/typst-ts-web-compiler": "0.7.0",
     "@myriaddreamin/typst.ts": "0.7.0"