office-viewer 0.1.0 → 0.1.3

package/esm/openxml/word/InlineText.js

@@ -1,4 +1,4 @@
-import { __values } from '../../node_modules/tslib/tslib.es6.js';
+import { __values } from 'tslib';
 import { BookmarkStart } from './Bookmark.js';
 import { Hyperlink } from './Hyperlink.js';
 import { Run } from './Run.js';

package/esm/openxml/word/NoBreakHyphen.d.ts

@@ -0,0 +1,2 @@
+export declare class NoBreakHyphen {
+}

package/esm/openxml/word/NoBreakHyphen.js

@@ -0,0 +1,7 @@
+var NoBreakHyphen = /** @class */ (function () {
+    function NoBreakHyphen() {
+    }
+    return NoBreakHyphen;
+}());
+
+export { NoBreakHyphen };

package/esm/openxml/word/Note.d.ts

@@ -0,0 +1,12 @@
+/**
+ * footnote 和 endnote 的结构几乎是一样的，所以统一叫 Note 了
+ */
+import Word from '../../Word';
+import { Paragraph } from './Paragraph';
+import { Table } from './Table';
+export type NoteChild = Paragraph | Table;
+export declare class Note {
+    children: NoteChild[];
+    addChild(child: NoteChild): void;
+    static fromXML(word: Word, element: Element): Note;
+}

package/esm/openxml/word/Note.js

@@ -0,0 +1,48 @@
+import { __values } from 'tslib';
+import { parseTable } from '../../parse/parseTable.js';
+import { Paragraph } from './Paragraph.js';
+
+/**
+ * footnote 和 endnote 的结构几乎是一样的，所以统一叫 Note 了
+ */
+var Note = /** @class */ (function () {
+    function Note() {
+        this.children = [];
+    }
+    Note.prototype.addChild = function (child) {
+        this.children.push(child);
+    };
+    Note.fromXML = function (word, element) {
+        var e_1, _a;
+        var note = new Note();
+        try {
+            for (var _b = __values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                var tagName = child.tagName;
+                switch (tagName) {
+                    case 'w:p':
+                        var paragraph = Paragraph.fromXML(word, child);
+                        note.addChild(paragraph);
+                        break;
+                    case 'w:tbl':
+                        var table = parseTable(word, child);
+                        note.addChild(table);
+                        break;
+                    default:
+                        console.warn('Note.fromXML unknown tag', tagName, child);
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return note;
+    };
+    return Note;
+}());
+
+export { Note };

package/esm/openxml/word/Paragraph.d.ts

@@ -8,8 +8,8 @@ import { NumberPr } from './numbering/NumberProperties';
 import { Properties } from './properties/Properties';
 import { Run, RunPr } from './Run';
 import { Tab } from './Tab';
-import { SmartTag } from './SmartTag';
 import { FldSimple } from './FldSimple';
+import { OMath } from '../math/OMath';
 /**
  * 这里简化了很多，如果能用 CSS 表示就直接用 CSS 表示
  */
@@ -22,7 +22,7 @@ export interface ParagraphPr extends Properties {
      */
     autoSpace?: boolean;
 }
-export type ParagraphChild = Run | BookmarkStart | Hyperlink | SmartTag | FldSimple;
+export type ParagraphChild = Run | BookmarkStart | Hyperlink | FldSimple | OMath;
 export declare class Paragraph {
     paraId?: string;
     properties: ParagraphPr;

package/esm/openxml/word/Paragraph.js

@@ -1,4 +1,4 @@
-import { __values } from '../../node_modules/tslib/tslib.es6.js';
+import { __values } from 'tslib';
 import { getVal } from '../../OpenXML.js';
 import { parsePr } from '../../parse/parsePr.js';
 import { BookmarkStart } from './Bookmark.js';
@@ -6,8 +6,9 @@ import { Hyperlink } from './Hyperlink.js';
 import { NumberPr } from './numbering/NumberProperties.js';
 import { Run } from './Run.js';
 import { Tab } from './Tab.js';
-import { SmartTag } from './SmartTag.js';
 import { FldSimple } from './FldSimple.js';
+import { OMath } from '../math/OMath.js';
+import { mergeSdt } from '../../parse/mergeSdt.js';
 
 /**
  * 段落的定义和解析
@@ -45,12 +46,12 @@ var Paragraph = /** @class */ (function () {
         var e_1, _a;
         var cssStyle = parsePr(word, element);
         var pStyle;
-        var pStyleTag = element.querySelector('pStyle');
+        var pStyleTag = element.getElementsByTagName('w:pStyle').item(0);
         if (pStyleTag) {
             pStyle = getVal(pStyleTag);
         }
         var numPr;
-        var numPrTag = element.querySelector('numPr');
+        var numPrTag = element.getElementsByTagName('w:numPr').item(0);
         if (numPrTag) {
             numPr = NumberPr.fromXML(word, numPrTag);
         }
@@ -78,7 +79,7 @@ var Paragraph = /** @class */ (function () {
         paragraph.fldSimples = [];
         paragraph.paraId = element.getAttribute('w14:paraId') || '';
         try {
-            for (var _b = __values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(mergeSdt(element)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {
@@ -105,14 +106,14 @@ var Paragraph = /** @class */ (function () {
                     case 'w:moveFrom':
                         // del 看起来主要是用于跟踪历史的，先不支持
                         break;
-                    case 'w:smartTag':
-                    case 'w:customXml':
-                        paragraph.addChild(SmartTag.fromXML(word, child));
-                        break;
                     case 'w:fldSimple':
                         // 这个目前还不想支持
                         paragraph.fldSimples.push(FldSimple.fromXML(word, child));
                         break;
+                    case 'm:oMathPara':
+                    case 'm:oMath':
+                        paragraph.addChild(OMath.fromXML(word, child));
+                        break;
                     default:
                         console.warn('parse Paragraph: Unknown key', tagName, child);
                 }

package/esm/openxml/word/Pict.d.ts

@@ -1,6 +1,5 @@
-import { Relationship } from '../../parse/parseRelationship';
 import Word from '../../Word';
 export declare class Pict {
-    imagedata?: Relationship;
+    src?: string | null;
     static fromXML(word: Word, element: Element): Pict | null;
 }

package/esm/openxml/word/Pict.js

@@ -3,12 +3,14 @@ var Pict = /** @class */ (function () {
     }
     Pict.fromXML = function (word, element) {
         var pict = new Pict();
-        var imagedataElement = element.querySelector('imagedata');
+        var imagedataElement = element
+            .getElementsByTagName('v:imagedata')
+            .item(0);
         if (imagedataElement) {
             var rId = imagedataElement.getAttribute('r:id') || '';
-            var rel = word.getRelationship(rId);
+            var rel = word.getDocumentRels(rId);
             if (rel) {
-                pict.imagedata = rel;
+                pict.src = word.loadImage(rel);
             }
         }
         return pict;

package/esm/openxml/word/Ruby.js

@@ -1,4 +1,4 @@
-import { __values, __extends } from '../../node_modules/tslib/tslib.es6.js';
+import { __values, __extends } from 'tslib';
 import { Run } from './Run.js';
 
 /**

package/esm/openxml/word/Run.d.ts

@@ -1,11 +1,14 @@
 import Word from '../../Word';
-import { ST_VerticalAlignRun } from '../Types';
+import { ST_FldCharType, ST_VerticalAlignRun } from '../Types';
 import { Break } from './Break';
-import { Drawing } from './drawing/Drawing';
+import { Drawing } from '../drawing/Drawing';
 import { InstrText } from './InstrText';
+import { NoBreakHyphen } from './NoBreakHyphen';
 import { Pict } from './Pict';
 import { Properties } from './properties/Properties';
 import { Ruby } from './Ruby';
+import { Separator } from './Separator';
+import { SoftHyphen } from './SoftHyphen';
 import { Sym } from './Sym';
 import { Tab } from './Tab';
 /**
@@ -20,10 +23,11 @@ export declare class Text {
     text: string;
     constructor(text: string | number);
 }
-type RunChild = Break | Drawing | Text | Tab | Pict | Ruby | InstrText | Sym;
+type RunChild = Break | Drawing | Text | Tab | Pict | Ruby | InstrText | Sym | SoftHyphen | Separator | NoBreakHyphen;
 export declare class Run {
     properties: RunPr;
     children: RunChild[];
+    fldChar?: ST_FldCharType;
     addChild(child: RunChild | null): void;
     static parseRunPr(word: Word, element: Element): RunPr;
     static fromXML(word: Word, element: Element): Run;

package/esm/openxml/word/Run.js

@@ -1,11 +1,14 @@
-import { __values } from '../../node_modules/tslib/tslib.es6.js';
+import { __values } from 'tslib';
 import { getVal } from '../../OpenXML.js';
 import { parsePr } from '../../parse/parsePr.js';
 import { Break } from './Break.js';
-import { Drawing } from './drawing/Drawing.js';
+import { Drawing } from '../drawing/Drawing.js';
 import { InstrText } from './InstrText.js';
+import { NoBreakHyphen } from './NoBreakHyphen.js';
 import { Pict } from './Pict.js';
 import { Ruby } from './Ruby.js';
+import { Separator } from './Separator.js';
+import { SoftHyphen } from './SoftHyphen.js';
 import { Sym } from './Sym.js';
 import { Tab } from './Tab.js';
 
@@ -52,6 +55,7 @@ var Run = /** @class */ (function () {
                         run.properties = Run.parseRunPr(word, child);
                         break;
                     case 'w:br':
+                    case 'w:cr':
                         run.addChild(Break.fromXML(word, child));
                         break;
                     case 'w:drawing':
@@ -61,13 +65,15 @@ var Run = /** @class */ (function () {
                         run.addChild(Tab.fromXML(word, child));
                         break;
                     case 'w:fldChar':
-                        // 似乎只需要支持 instrText
+                        run.fldChar = child.getAttribute('w:fldCharType');
                         break;
                     case 'w:instrText':
                         run.addChild(new InstrText(child.textContent || ''));
                         break;
                     case 'w:lastRenderedPageBreak':
-                        // 目前也不支持分页显示
+                        var pageBreak = new Break();
+                        pageBreak.type = 'page';
+                        run.addChild(pageBreak);
                         break;
                     case 'w:pict':
                         run.addChild(Pict.fromXML(word, child));
@@ -78,6 +84,24 @@ var Run = /** @class */ (function () {
                     case 'w:sym':
                         run.addChild(Sym.parseXML(child));
                         break;
+                    case 'mc:AlternateContent':
+                        var drawingChild = child.getElementsByTagName('w:drawing').item(0);
+                        if (drawingChild) {
+                            run.addChild(Drawing.fromXML(word, drawingChild));
+                        }
+                        break;
+                    case 'w:softHyphen':
+                        run.addChild(new SoftHyphen());
+                        break;
+                    case 'w:noBreakHyphen':
+                        run.addChild(new NoBreakHyphen());
+                        break;
+                    case 'w:separator':
+                        run.addChild(new Separator());
+                        break;
+                    case 'w:continuationSeparator':
+                        // TODO: 还不知道是啥
+                        break;
                     default:
                         console.warn('parse Run: Unknown key', tagName, child);
                 }

package/esm/openxml/word/Section.d.ts

@@ -3,10 +3,12 @@
  * word 文档是按 section 组织的
  * 参考了 docx 里的类型定义
  */
+import Word from '../../Word';
 import { ST_PageOrientation } from '../Types';
-import { Hyperlink } from './Hyperlink';
 import { Paragraph } from './Paragraph';
 import { Table } from './Table';
+import { Body } from './Body';
+import { Header } from './Header';
 export type PageSize = {
     width: string;
     height: string;
@@ -21,18 +23,29 @@ export type PageMargin = {
     footer?: string;
     gutter?: string;
 };
+/**
+ * 列设置，其实这里支持
+ */
 export interface Column {
-    width?: number;
-    space?: number;
+    num?: number;
+    space?: string;
 }
-export type SectionChild = Paragraph | Table | Hyperlink;
+export type SectionChild = Paragraph | Table;
 export interface SectionPr {
     pageSize?: PageSize;
     pageMargin?: PageMargin;
+    cols?: Column;
+    headers?: {
+        [key in HeaderType]?: Header;
+    };
+    footers?: {
+        [key in HeaderType]?: Header;
+    };
 }
+export type HeaderType = 'default' | 'first' | 'even';
 export declare class Section {
     properties: SectionPr;
     children: SectionChild[];
     addChild(child: SectionChild): void;
-    static parsePr(element: Element): SectionPr;
+    static parsePr(word: Word, element: Element, body: Body): SectionPr;
 }

package/esm/openxml/word/Section.js

@@ -1,11 +1,31 @@
-import { __values } from '../../node_modules/tslib/tslib.es6.js';
+import { __values } from 'tslib';
 import { parseSize } from '../../parse/parseSize.js';
+import { getAttrNumber } from '../../OpenXML.js';
+import { Header } from './Header.js';
 
 /**
  * section 属性
  * word 文档是按 section 组织的
  * 参考了 docx 里的类型定义
  */
+function parseHeader(word, element, type) {
+    var headerType = element.getAttribute('w:type');
+    var headerId = element.getAttribute('r:id');
+    if (headerType && headerId) {
+        var headerRel = word.getDocumentRels(headerId);
+        if (headerRel) {
+            var headerDoc = word.getXML('/word/' + headerRel.target);
+            if (headerDoc) {
+                var header = Header.fromXML(word, headerDoc);
+                return {
+                    headerType: headerType,
+                    header: header
+                };
+            }
+        }
+    }
+    return null;
+}
 var Section = /** @class */ (function () {
     function Section() {
         this.properties = {};
@@ -14,9 +34,11 @@ var Section = /** @class */ (function () {
     Section.prototype.addChild = function (child) {
         this.children.push(child);
     };
-    Section.parsePr = function (element) {
+    Section.parsePr = function (word, element, body) {
         var e_1, _a;
         var properties = {};
+        properties.headers = {};
+        properties.footers = {};
         try {
             for (var _b = __values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
@@ -39,6 +61,28 @@ var Section = /** @class */ (function () {
                             gutter: parseSize(child, 'w:gutter')
                         };
                         break;
+                    case 'w:headerReference':
+                        var header = parseHeader(word, child, 'header');
+                        if (header) {
+                            properties.headers[header.headerType] = header.header;
+                        }
+                        break;
+                    case 'w:footerReference':
+                        var footer = parseHeader(word, child, 'footer');
+                        if (footer) {
+                            properties.footers[footer.headerType] = footer.header;
+                        }
+                        break;
+                    case 'w:cols':
+                        var cols = {};
+                        var num = getAttrNumber(child, 'w:num', 1);
+                        cols.num = num;
+                        var space = parseSize(child, 'w:space');
+                        if (space) {
+                            cols.space = space;
+                        }
+                        properties.cols = cols;
+                        break;
                     default:
                         break;
                 }

package/esm/openxml/word/Separator.d.ts

@@ -0,0 +1,5 @@
+/**
+ * endnote 和 footnote 的分隔符
+ */
+export declare class Separator {
+}

package/esm/openxml/word/Separator.js

@@ -0,0 +1,10 @@
+/**
+ * endnote 和 footnote 的分隔符
+ */
+var Separator = /** @class */ (function () {
+    function Separator() {
+    }
+    return Separator;
+}());
+
+export { Separator };

package/esm/openxml/word/SoftHyphen.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 对应 w:softHyphen
+ */
+export declare class SoftHyphen {
+}

package/esm/openxml/word/SoftHyphen.js

@@ -0,0 +1,10 @@
+/**
+ * 对应 w:softHyphen
+ */
+var SoftHyphen = /** @class */ (function () {
+    function SoftHyphen() {
+    }
+    return SoftHyphen;
+}());
+
+export { SoftHyphen };

package/esm/openxml/word/Table.d.ts

@@ -1,12 +1,10 @@
 /**
  * http://officeopenxml.com/WPtable.php
  */
-import Word from '../../Word';
 import { CSSStyle } from '../Style';
-import { CT_TblLook } from '../Types';
 import { Properties } from './properties/Properties';
-import { Tr } from './table/Tr';
-export type CT_TblLookKey = keyof CT_TblLook;
+import type { Tr } from './table/Tr';
+export type TblLookKey = 'firstRow' | 'firstRow' | 'lastRow' | 'firstColumn' | 'lastColumn' | 'noHBand' | 'noVBand';
 export interface TablePr extends Properties {
     /**
      * 表格标题
@@ -26,7 +24,7 @@ export interface TablePr extends Properties {
     /**
      * 条件格式
      */
-    tblLook?: Record<CT_TblLookKey, boolean>;
+    tblLook?: Record<TblLookKey, boolean>;
     /**
      * 行间隔
      */
@@ -36,14 +34,11 @@ export interface TablePr extends Properties {
      */
     colBandSize?: number;
 }
-interface GridCol {
+export interface GridCol {
     w: string;
 }
 export declare class Table {
     properties: TablePr;
     tblGrid: GridCol[];
     trs: Tr[];
-    static parseTablePr(word: Word, element: Element): TablePr;
-    static fromXML(word: Word, element: Element): Table;
 }
-export {};