@file-viewer/renderer-ofd 2.1.16 → 2.1.18

package/README.en.md

@@ -41,7 +41,7 @@ const options = {
 
 ## Migration Note
 
-OFD rendering has moved out of `@file-viewer/core` into this package. `jszip`, `ofd-xml-parser`, and the DLTech21/ofd.js vendor files are now owned by `@file-viewer/renderer-ofd`. Installing core or a standard component package no longer pulls OFD parsing dependencies; explicitly assemble this renderer when OFD preview is needed, or use `@file-viewer/preset-all`.
+OFD rendering has moved out of `@file-viewer/core` into this package. `jszip`, the local XML parsing logic, and the DLTech21/ofd.js vendor files are now owned by `@file-viewer/renderer-ofd`. Installing core or a standard component package no longer pulls OFD parsing dependencies; explicitly assemble this renderer when OFD preview is needed, or use `@file-viewer/preset-all`.
 
 ## Documentation
 

package/README.md

@@ -41,7 +41,7 @@ const options = {
 
 ## 迁移说明
 
-OFD 渲染已经从 `@file-viewer/core` 移入本包，`jszip`、`ofd-xml-parser` 和 DLTech21/ofd.js vendor 只由 `@file-viewer/renderer-ofd` 承接。只安装 core 或标准组件包时不会再拉取 OFD 解析依赖；需要 OFD 预览时请显式装配本 renderer，或使用 `@file-viewer/preset-all`。
+OFD 渲染已经从 `@file-viewer/core` 移入本包，`jszip`、本地 XML 解析逻辑和 DLTech21/ofd.js vendor 只由 `@file-viewer/renderer-ofd` 承接。只安装 core 或标准组件包时不会再拉取 OFD 解析依赖；需要 OFD 预览时请显式装配本 renderer，或使用 `@file-viewer/preset-all`。
 
 ## 文档
 

package/dist/ofd.js

@@ -1,4 +1,4 @@
-import { createFileViewerZoomChangeEmitter, registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
+import { createFileViewerTranslator, createFileViewerZoomChangeEmitter, normalizeFileViewerErrorMessage, registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
 const OFD_MIN_SCALE = 0.35;
 const OFD_MAX_SCALE = 3;
 const OFD_ZOOM_STEP = 0.1;
@@ -38,18 +38,15 @@ const createElement = (documentRef, tagName, className, text) => {
     }
     return element;
 };
-const normalizeError = (reason) => {
-    if (reason instanceof Error) {
-        return reason.message;
-    }
-    if (typeof reason === 'string') {
-        return reason;
+const normalizeError = (reason, fallback, context) => {
+    if (reason instanceof Error || typeof reason === 'string') {
+        return normalizeFileViewerErrorMessage(reason, context === null || context === void 0 ? void 0 : context.options);
     }
     try {
         return JSON.stringify(reason);
     }
     catch {
-        return String(reason || 'OFD 文件解析失败');
+        return String(reason || fallback);
     }
 };
 const clampZoom = (value) => Math.min(OFD_MAX_SCALE, Math.max(OFD_MIN_SCALE, Number(value.toFixed(2))));
@@ -82,6 +79,7 @@ const appendPages = (documentRef, target, pages) => {
     target.appendChild(fragment);
 };
 export default async function renderOfd(buffer, target, context) {
+    const t = createFileViewerTranslator(context === null || context === void 0 ? void 0 : context.options);
     const documentRef = target.ownerDocument || document;
     const targetWindow = documentRef.defaultView || (typeof window !== 'undefined' ? window : null);
     const zoomEmitter = createFileViewerZoomChangeEmitter();
@@ -97,7 +95,7 @@ export default async function renderOfd(buffer, target, context) {
     const style = createStyle(documentRef);
     const viewer = createElement(documentRef, 'div', 'ofd-viewer');
     viewer.dataset.viewerZoomProvider = 'ofd';
-    const stateNode = createElement(documentRef, 'div', 'ofd-state', '正在解析 OFD...');
+    const stateNode = createElement(documentRef, 'div', 'ofd-state', t('ofd.state.loading'));
     stateNode.setAttribute('aria-live', 'polite');
     const stage = createElement(documentRef, 'div', 'ofd-stage');
     viewer.append(stateNode, stage);
@@ -108,14 +106,14 @@ export default async function renderOfd(buffer, target, context) {
     const syncState = () => {
         stateNode.hidden = state === 'ready';
         stateNode.classList.toggle('error', state === 'error');
-        stateNode.textContent = state === 'error' ? errorMessage : '正在解析 OFD...';
+        stateNode.textContent = state === 'error' ? errorMessage : t('ofd.state.loading');
     };
     const getOfdDocument = async (ofd) => {
         // OFD 解压和 XML 解析成本较高，尺寸变化只重排页面，不重复解析压缩包。
         ofdDocumentPromise || (ofdDocumentPromise = parseWithOfdJs(ofd, buffer).then(documents => {
             const ofdDocument = documents[0];
             if (!ofdDocument) {
-                throw new Error('OFD 文件中没有可渲染的文档');
+                throw new Error(t('ofd.error.empty'));
             }
             return ofdDocument;
         }));
@@ -217,7 +215,7 @@ export default async function renderOfd(buffer, target, context) {
             }
             console.error(reason);
             state = 'error';
-            errorMessage = normalizeError(reason) || 'OFD 文件解析失败';
+            errorMessage = normalizeError(reason, t('ofd.error.parseFailed'), context) || t('ofd.error.parseFailed');
             syncState();
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-ofd",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "private": false,
   "type": "module",
   "description": "Standalone OFD renderer plugin for Flyfish File Viewer powered by DLTech21/ofd.js.",
@@ -32,7 +32,7 @@
   },
   "funding": {
     "type": "individual",
-    "url": "https://dev.flyfish.group/shop"
+    "url": "https://dev.flyfish.group/donate?source=npm"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -53,9 +53,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "^2.1.16",
-    "jszip": "^3.10.1",
-    "ofd-xml-parser": "^0.0.6"
+    "@file-viewer/core": "^2.1.18",
+    "jszip": "^3.10.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3"

package/vendor/dltech/ofd/ofd_parser.js

@@ -19,12 +19,11 @@
  */
 
 import JsZip from "jszip";
-import parser from 'ofd-xml-parser';
 import {parseStBox, getExtensionByPath, replaceFirstSlash} from "./ofd_util.js";
 import {Jbig2Image} from '../jbig2/jbig2.js';
 
 const ensureBrowserGlobal = () => {
-    // ofd-xml-parser 是从 DLTech21/ofd.js 继承下来的 CommonJS 包，内部读取 Node 风格 global。
+    // DLTech21/ofd.js 的一部分遗留逻辑读取 Node 风格 global。
     // 浏览器端把它映射到 globalThis，避免解析 XML 时抛出 global is not defined。
     if (!globalThis.global) {
         globalThis.global = globalThis;
@@ -32,6 +31,65 @@ const ensureBrowserGlobal = () => {
     globalThis.xmlParseFlag = 0;
 }
 
+const appendChildValue = function (target, key, value) {
+    if (Object.prototype.hasOwnProperty.call(target, key)) {
+        target[key] = Array.isArray(target[key])
+            ? target[key].concat(value)
+            : [target[key], value];
+        return;
+    }
+    target[key] = value;
+}
+
+const parseXmlElement = function (element, options) {
+    const attrPrefix = options.attributeNamePrefix ?? '@_';
+    const result = {};
+    if (options.ignoreAttributes !== true) {
+        for (const attr of Array.from(element.attributes || [])) {
+            result[`${attrPrefix}${attr.name}`] = attr.value;
+        }
+    }
+
+    const textParts = [];
+    for (const child of Array.from(element.childNodes || [])) {
+        if (child.nodeType === 1) {
+            appendChildValue(result, child.nodeName, parseXmlElement(child, options));
+            continue;
+        }
+        if (child.nodeType === 3 || child.nodeType === 4) {
+            textParts.push(child.nodeValue || '');
+        }
+    }
+
+    const text = textParts.join('').trim();
+    if (text) {
+        if (Object.keys(result).length === 0) {
+            return text;
+        }
+        result['#text'] = text;
+    }
+    return result;
+}
+
+const parseXmlToJson = function (xmlData, options = {}) {
+    const DOMParserCtor = globalThis.DOMParser;
+    if (typeof DOMParserCtor !== 'function') {
+        throw new Error('OFD XML parser requires DOMParser in the current runtime');
+    }
+    const document = new DOMParserCtor().parseFromString(xmlData, 'application/xml');
+    const parserError = document.getElementsByTagName('parsererror')[0];
+    if (parserError) {
+        throw new Error(parserError.textContent || 'OFD XML parse failed');
+    }
+    const root = document.documentElement;
+    if (!root) {
+        return {};
+    }
+    return {
+        [root.nodeName]: parseXmlElement(root, options)
+    };
+}
+
 const asArray = function (value) {
     if (!value) {
         return [];
@@ -486,7 +544,7 @@ const getJsonFromXmlContent = async function (zip, xmlName) {
                 parseNodeValue: false,
                 trimValues: false
             };
-            let jsonObj = parser.parse(content, ops);
+            let jsonObj = parseXmlToJson(content, ops);
             let result = {'xml': content, 'json': jsonObj};
             resolve(result);
         }, function error(e) {