office-viewer 0.1.0 → 0.1.3

package/lib/openxml/word/Header.js

@@ -0,0 +1,58 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var mergeSdt = require('../../parse/mergeSdt.js');
+var parseTable = require('../../parse/parseTable.js');
+var Paragraph = require('./Paragraph.js');
+
+/**
+ * header 的定义，footer 也是用这个，因为结构是一样的
+ */
+var Header = /** @class */ (function () {
+    function Header() {
+        this.children = [];
+    }
+    Header.fromXML = function (word, doc) {
+        var e_1, _a;
+        var footer = new Header();
+        var children = [];
+        footer.children = children;
+        var elm = doc;
+        var firstChild = doc.firstElementChild;
+        if (firstChild &&
+            (firstChild.tagName === 'w:hdr' || firstChild.tagName === 'w:ftr')) {
+            elm = firstChild;
+        }
+        try {
+            for (var _b = tslib.__values(mergeSdt.mergeSdt(elm)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                var tagName = child.tagName;
+                switch (tagName) {
+                    case 'w:p':
+                        var paragraph = Paragraph.Paragraph.fromXML(word, child);
+                        children.push(paragraph);
+                        break;
+                    case 'w:tbl':
+                        var table = parseTable.parseTable(word, child);
+                        children.push(table);
+                        break;
+                    default:
+                        console.warn('Header.fromXML Unknown key', 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 footer;
+    };
+    return Header;
+}());
+
+exports.Header = Header;

package/lib/openxml/word/Hyperlink.d.ts

@@ -8,6 +8,7 @@ export declare class Hyperlink {
     anchor?: string;
     relation?: Relationship;
     children: Run[];
+    tooltip?: string;
     addChild(Run: Run): void;
     static fromXML(word: Word, element: Element): Hyperlink;
 }

package/lib/openxml/word/Hyperlink.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var Run = require('./Run.js');
 
 /**
@@ -20,17 +20,21 @@ var Hyperlink = /** @class */ (function () {
         var hyperlink = new Hyperlink();
         var rId = element.getAttribute('r:id');
         if (rId) {
-            var rel = word.getRelationship(rId);
+            var rel = word.getDocumentRels(rId);
             if (rel) {
                 hyperlink.relation = rel;
             }
         }
-        var anchor = element.getAttribute('anchor');
+        var anchor = element.getAttribute('w:anchor');
         if (anchor) {
             hyperlink.anchor = anchor;
         }
+        var tooltip = element.getAttribute('w:tooltip');
+        if (tooltip) {
+            hyperlink.tooltip = tooltip;
+        }
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {

package/lib/openxml/word/InlineText.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var Bookmark = require('./Bookmark.js');
 var Hyperlink = require('./Hyperlink.js');
 var Run = require('./Run.js');
@@ -21,7 +21,7 @@ var InlineText = /** @class */ (function () {
         var e_1, _a;
         var smartTag = new InlineText();
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {

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

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

package/lib/openxml/word/NoBreakHyphen.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var NoBreakHyphen = /** @class */ (function () {
+    function NoBreakHyphen() {
+    }
+    return NoBreakHyphen;
+}());
+
+exports.NoBreakHyphen = NoBreakHyphen;

package/lib/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/lib/openxml/word/Note.js

@@ -0,0 +1,52 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var parseTable = require('../../parse/parseTable.js');
+var Paragraph = require('./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 = tslib.__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.Paragraph.fromXML(word, child);
+                        note.addChild(paragraph);
+                        break;
+                    case 'w:tbl':
+                        var table = parseTable.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;
+}());
+
+exports.Note = Note;

package/lib/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/lib/openxml/word/Paragraph.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var OpenXML = require('../../OpenXML.js');
 var parsePr = require('../../parse/parsePr.js');
 var Bookmark = require('./Bookmark.js');
@@ -10,8 +10,9 @@ var Hyperlink = require('./Hyperlink.js');
 var NumberProperties = require('./numbering/NumberProperties.js');
 var Run = require('./Run.js');
 var Tab = require('./Tab.js');
-var SmartTag = require('./SmartTag.js');
 var FldSimple = require('./FldSimple.js');
+var OMath = require('../math/OMath.js');
+var mergeSdt = require('../../parse/mergeSdt.js');
 
 /**
  * 段落的定义和解析
@@ -49,19 +50,19 @@ var Paragraph = /** @class */ (function () {
         var e_1, _a;
         var cssStyle = parsePr.parsePr(word, element);
         var pStyle;
-        var pStyleTag = element.querySelector('pStyle');
+        var pStyleTag = element.getElementsByTagName('w:pStyle').item(0);
         if (pStyleTag) {
             pStyle = OpenXML.getVal(pStyleTag);
         }
         var numPr;
-        var numPrTag = element.querySelector('numPr');
+        var numPrTag = element.getElementsByTagName('w:numPr').item(0);
         if (numPrTag) {
             numPr = NumberProperties.NumberPr.fromXML(word, numPrTag);
         }
         var tabs = [];
         var tabElements = element.getElementsByTagName('w:tab');
         try {
-            for (var tabElements_1 = tslib_es6.__values(tabElements), tabElements_1_1 = tabElements_1.next(); !tabElements_1_1.done; tabElements_1_1 = tabElements_1.next()) {
+            for (var tabElements_1 = tslib.__values(tabElements), tabElements_1_1 = tabElements_1.next(); !tabElements_1_1.done; tabElements_1_1 = tabElements_1.next()) {
                 var tabElement = tabElements_1_1.value;
                 tabs.push(Tab.Tab.fromXML(word, tabElement));
             }
@@ -82,7 +83,7 @@ var Paragraph = /** @class */ (function () {
         paragraph.fldSimples = [];
         paragraph.paraId = element.getAttribute('w14:paraId') || '';
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(mergeSdt.mergeSdt(element)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {
@@ -109,14 +110,14 @@ var Paragraph = /** @class */ (function () {
                     case 'w:moveFrom':
                         // del 看起来主要是用于跟踪历史的，先不支持
                         break;
-                    case 'w:smartTag':
-                    case 'w:customXml':
-                        paragraph.addChild(SmartTag.SmartTag.fromXML(word, child));
-                        break;
                     case 'w:fldSimple':
                         // 这个目前还不想支持
                         paragraph.fldSimples.push(FldSimple.FldSimple.fromXML(word, child));
                         break;
+                    case 'm:oMathPara':
+                    case 'm:oMath':
+                        paragraph.addChild(OMath.OMath.fromXML(word, child));
+                        break;
                     default:
                         console.warn('parse Paragraph: Unknown key', tagName, child);
                 }

package/lib/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/lib/openxml/word/Pict.js

@@ -7,12 +7,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/lib/openxml/word/Ruby.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var Run = require('./Run.js');
 
 /**
@@ -17,7 +17,7 @@ var RubyBase = /** @class */ (function () {
         var rubyBase = new RubyBase();
         rubyBase.children = [];
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {
@@ -45,7 +45,7 @@ var RubyBase = /** @class */ (function () {
 }());
 // 看起来应该是一样的
 /** @class */ ((function (_super) {
-    tslib_es6.__extends(RubyText, _super);
+    tslib.__extends(RubyText, _super);
     function RubyText() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
@@ -58,7 +58,7 @@ var Ruby = /** @class */ (function () {
         var e_2, _a;
         var ruby = new Ruby();
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {

package/lib/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/lib/openxml/word/Run.js

@@ -2,14 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var OpenXML = require('../../OpenXML.js');
 var parsePr = require('../../parse/parsePr.js');
 var Break = require('./Break.js');
-var Drawing = require('./drawing/Drawing.js');
+var Drawing = require('../drawing/Drawing.js');
 var InstrText = require('./InstrText.js');
+var NoBreakHyphen = require('./NoBreakHyphen.js');
 var Pict = require('./Pict.js');
 var Ruby = require('./Ruby.js');
+var Separator = require('./Separator.js');
+var SoftHyphen = require('./SoftHyphen.js');
 var Sym = require('./Sym.js');
 var Tab = require('./Tab.js');
 
@@ -43,7 +46,7 @@ var Run = /** @class */ (function () {
         var e_1, _a;
         var run = new Run();
         try {
-            for (var _b = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {
@@ -56,6 +59,7 @@ var Run = /** @class */ (function () {
                         run.properties = Run.parseRunPr(word, child);
                         break;
                     case 'w:br':
+                    case 'w:cr':
                         run.addChild(Break.Break.fromXML(word, child));
                         break;
                     case 'w:drawing':
@@ -65,13 +69,15 @@ var Run = /** @class */ (function () {
                         run.addChild(Tab.Tab.fromXML(word, child));
                         break;
                     case 'w:fldChar':
-                        // 似乎只需要支持 instrText
+                        run.fldChar = child.getAttribute('w:fldCharType');
                         break;
                     case 'w:instrText':
                         run.addChild(new InstrText.InstrText(child.textContent || ''));
                         break;
                     case 'w:lastRenderedPageBreak':
-                        // 目前也不支持分页显示
+                        var pageBreak = new Break.Break();
+                        pageBreak.type = 'page';
+                        run.addChild(pageBreak);
                         break;
                     case 'w:pict':
                         run.addChild(Pict.Pict.fromXML(word, child));
@@ -82,6 +88,24 @@ var Run = /** @class */ (function () {
                     case 'w:sym':
                         run.addChild(Sym.Sym.parseXML(child));
                         break;
+                    case 'mc:AlternateContent':
+                        var drawingChild = child.getElementsByTagName('w:drawing').item(0);
+                        if (drawingChild) {
+                            run.addChild(Drawing.Drawing.fromXML(word, drawingChild));
+                        }
+                        break;
+                    case 'w:softHyphen':
+                        run.addChild(new SoftHyphen.SoftHyphen());
+                        break;
+                    case 'w:noBreakHyphen':
+                        run.addChild(new NoBreakHyphen.NoBreakHyphen());
+                        break;
+                    case 'w:separator':
+                        run.addChild(new Separator.Separator());
+                        break;
+                    case 'w:continuationSeparator':
+                        // TODO: 还不知道是啥
+                        break;
                     default:
                         console.warn('parse Run: Unknown key', tagName, child);
                 }

package/lib/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/lib/openxml/word/Section.js

@@ -2,14 +2,34 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib_es6 = require('../../node_modules/tslib/tslib.es6.js');
+var tslib = require('tslib');
 var parseSize = require('../../parse/parseSize.js');
+var OpenXML = require('../../OpenXML.js');
+var Header = require('./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.Header.fromXML(word, headerDoc);
+                return {
+                    headerType: headerType,
+                    header: header
+                };
+            }
+        }
+    }
+    return null;
+}
 var Section = /** @class */ (function () {
     function Section() {
         this.properties = {};
@@ -18,11 +38,13 @@ 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 = tslib_es6.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib.__values(element.children), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var child = _c.value;
                 var tagName = child.tagName;
                 switch (tagName) {
@@ -43,6 +65,28 @@ var Section = /** @class */ (function () {
                             gutter: parseSize.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 = OpenXML.getAttrNumber(child, 'w:num', 1);
+                        cols.num = num;
+                        var space = parseSize.parseSize(child, 'w:space');
+                        if (space) {
+                            cols.space = space;
+                        }
+                        properties.cols = cols;
+                        break;
                     default:
                         break;
                 }

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

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

package/lib/openxml/word/Separator.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * endnote 和 footnote 的分隔符
+ */
+var Separator = /** @class */ (function () {
+    function Separator() {
+    }
+    return Separator;
+}());
+
+exports.Separator = Separator;

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

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

package/lib/openxml/word/SoftHyphen.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * 对应 w:softHyphen
+ */
+var SoftHyphen = /** @class */ (function () {
+    function SoftHyphen() {
+    }
+    return SoftHyphen;
+}());
+
+exports.SoftHyphen = SoftHyphen;