@manuscripts/transform 2.1.1-LEAN-3336-19 → 2.1.1-LEAN-3352-0

package/dist/cjs/jats/importer/jats-body-dom-parser.js

@@ -530,6 +530,10 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'tbody',
+        skip: true,
+    },
     {
         tag: 'tfoot',
         skip: true,
@@ -564,12 +568,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_header',
+        node: 'table_cell',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            return Object.assign(Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
+            return Object.assign(Object.assign(Object.assign({ celltype: 'th' }, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
         },
     },
     {

package/dist/cjs/jats/importer/jats-front-parser.js

@@ -45,6 +45,11 @@ exports.jatsFrontParser = {
         }
         return titles;
     },
+    parseDOI(front) {
+        var _a;
+        const doi = front === null || front === void 0 ? void 0 : front.querySelector('article-meta > article-id[pub-id-type="doi"]');
+        return (_a = doi === null || doi === void 0 ? void 0 : doi.textContent) !== null && _a !== void 0 ? _a : undefined;
+    },
     parseCounts(counts) {
         var _a, _b, _c, _d, _e;
         if (counts) {

package/dist/cjs/jats/importer/parse-jats-article.js

@@ -31,6 +31,7 @@ const parseJATSFront = (doc, front) => {
     const createElement = createElementFn(doc);
     const journal = jats_front_parser_1.jatsFrontParser.parseJournal(front.querySelector('journal-meta'));
     const titles = jats_front_parser_1.jatsFrontParser.parseTitles(front.querySelector('article-meta > title-group'), createElement);
+    const DOI = jats_front_parser_1.jatsFrontParser.parseDOI(front);
     const { affiliations, affiliationIDs } = jats_front_parser_1.jatsFrontParser.parseAffiliations([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -45,7 +46,7 @@ const parseJATSFront = (doc, front) => {
     ], affiliationIDs, footnoteIDs, correspondingIDs);
     const history = jats_front_parser_1.jatsFrontParser.parseDates(front.querySelector('article-meta > history'));
     const counts = jats_front_parser_1.jatsFrontParser.parseCounts(front.querySelector('article-meta counts'));
-    const manuscript = Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), counts), history);
+    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), counts), history), { DOI });
     return generateIDs([
         manuscript,
         titles,

package/dist/cjs/jats/jats-exporter.js

@@ -311,10 +311,10 @@ class JATSExporter {
                 articleID.textContent = id;
                 articleMeta.appendChild(articleID);
             }
-            if (doi) {
+            if (doi || manuscript.DOI) {
                 const articleID = this.document.createElement('article-id');
                 articleID.setAttribute('pub-id-type', 'doi');
-                articleID.textContent = doi;
+                articleID.textContent = doi !== null && doi !== void 0 ? doi : manuscript.DOI;
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
@@ -614,11 +614,6 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                table_header: (node) => [
-                    'th',
-                    Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
-                    0,
-                ],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -878,8 +873,9 @@ class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
+                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    'td',
+                    node.attrs.celltype,
                     Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
                     0,
                 ],
@@ -960,26 +956,6 @@ class JATSExporter {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
-            const appendTable = (element, node) => {
-                const tableNode = findChildNodeOfType(node, node.type.schema.nodes.table);
-                const colGroupNode = findChildNodeOfType(node, node.type.schema.nodes.table_colgroup);
-                if (!tableNode) {
-                    return;
-                }
-                const table = this.serializeNode(tableNode);
-                const tbodyElement = this.document.createElement('tbody');
-                while (table.firstChild) {
-                    const child = table.firstChild;
-                    table.removeChild(child);
-                    tbodyElement.appendChild(child);
-                }
-                table.appendChild(tbodyElement);
-                if (colGroupNode) {
-                    const colGroup = this.serializeNode(colGroupNode);
-                    table.insertBefore(colGroup, table.firstChild);
-                }
-                element.appendChild(table);
-            };
             const createFigureElement = (node, nodeName, contentNodeType, figType) => {
                 const element = createElement(node, nodeName);
                 if (figType) {
@@ -1000,7 +976,7 @@ class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendTable(element, node);
+                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.table_element_footer);
                 if ((0, node_types_1.isExecutableNodeType)(node.type)) {
                     processExecutableNode(node, element);

package/dist/cjs/schema/index.js

@@ -87,6 +87,7 @@ const table_1 = require("./nodes/table");
 const table_col_1 = require("./nodes/table_col");
 const table_element_1 = require("./nodes/table_element");
 const table_element_footer_1 = require("./nodes/table_element_footer");
+const table_row_1 = require("./nodes/table_row");
 const text_1 = require("./nodes/text");
 const title_1 = require("./nodes/title");
 const toc_element_1 = require("./nodes/toc_element");
@@ -136,6 +137,7 @@ __exportStar(require("./nodes/section_title"), exports);
 __exportStar(require("./nodes/table"), exports);
 __exportStar(require("./nodes/table_col"), exports);
 __exportStar(require("./nodes/table_element"), exports);
+__exportStar(require("./nodes/table_row"), exports);
 __exportStar(require("./nodes/text"), exports);
 __exportStar(require("./nodes/toc_element"), exports);
 __exportStar(require("./nodes/toc_section"), exports);
@@ -211,9 +213,10 @@ exports.schema = new prosemirror_model_1.Schema({
         section_title: section_title_1.sectionTitle,
         section_title_plain: section_title_1.sectionTitle,
         table: table_1.table,
-        table_cell: table_1.tableCell,
+        table_body: table_1.tableBody,
+        table_cell: table_row_1.tableCell,
         table_element: table_element_1.tableElement,
-        table_row: table_1.tableRow,
+        table_row: table_row_1.tableRow,
         table_col: table_col_1.tableCol,
         table_colgroup: table_col_1.tableColGroup,
         text: text_1.text,
@@ -227,6 +230,5 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
-        table_header: table_1.tableHeader,
     },
 });

package/dist/cjs/schema/nodes/table.js

@@ -15,78 +15,20 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = void 0;
-const prosemirror_tables_1 = require("prosemirror-tables");
-const tableOptions = {
-    cellContent: 'inline*',
-    cellAttributes: {
-        placeholder: {
-            default: 'Data',
-            getFromDOM(dom) {
-                return dom.getAttribute('data-placeholder-text') || '';
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['data-placeholder-text'] = value;
-                }
-            },
-        },
-        valign: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('valign');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['valign'] = value;
-                }
-            },
-        },
-        align: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('align');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['align'] = value;
-                }
-            },
-        },
-        scope: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('scope');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['scope'] = value;
-                }
-            },
-        },
-        style: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('style');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['style'] = value;
-                }
-            },
-        },
-    },
-};
-const tableNodes = (0, prosemirror_tables_1.tableNodes)(tableOptions);
+exports.tableBody = exports.table = void 0;
 exports.table = {
+    content: 'table_colgroup? table_body',
+    tableRole: 'table',
+    isolating: true,
+    group: 'block',
+    selectable: false,
     attrs: {
         id: { default: '' },
+        headerRows: { default: 1 },
+        footerRows: { default: 1 },
         dataTracked: { default: null },
+        comments: { default: null },
     },
-    content: 'table_row+',
-    tableRole: 'table',
-    isolating: true,
-    group: 'block',
     parseDOM: [
         {
             tag: 'table',
@@ -94,20 +36,35 @@ exports.table = {
                 const dom = p;
                 return {
                     id: dom.getAttribute('id'),
+                    headerRows: dom.dataset && dom.dataset['header-rows'],
+                    footerRows: dom.dataset && dom.dataset['footer-rows'],
                 };
             },
         },
     ],
-    toDOM(node) {
+    toDOM: (node) => {
+        const tableNode = node;
         return [
             'table',
             {
-                id: node.attrs.id,
+                id: tableNode.attrs.id,
+                'data-header-rows': String(node.attrs.headerRows),
+                'data-footer-rows': String(node.attrs.footerRows),
             },
-            ['tbody', 0],
+            0,
         ];
     },
 };
-exports.tableRow = Object.assign(Object.assign({}, tableNodes.table_row), { attrs: Object.assign(Object.assign({}, tableNodes.table_row.attrs), { dataTracked: { default: null } }) });
-exports.tableCell = Object.assign(Object.assign({}, tableNodes.table_cell), { attrs: Object.assign(Object.assign({}, tableNodes.table_cell.attrs), { dataTracked: { default: null } }) });
-exports.tableHeader = Object.assign(Object.assign({}, tableNodes.table_header), { attrs: Object.assign(Object.assign({}, tableNodes.table_row.attrs), { dataTracked: { default: null } }) });
+exports.tableBody = {
+    content: 'table_row+',
+    group: 'block',
+    tableRole: 'table',
+    parseDOM: [
+        {
+            tag: 'tbody',
+        },
+    ],
+    toDOM() {
+        return ['tbody', 0];
+    },
+};

package/dist/cjs/schema/nodes/table_element.js

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tableElement = void 0;
 exports.tableElement = {
-    content: 'table_colgroup? (table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
+    content: '(table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
     attrs: {
         id: { default: '' },
         paragraphStyle: { default: '' },

package/dist/cjs/schema/nodes/table_row.js

@@ -0,0 +1,123 @@
+"use strict";
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tableCell = exports.tableRow = void 0;
+const table_cell_styles_1 = require("../../lib/table-cell-styles");
+const getCellAttrs = (p) => {
+    const dom = p;
+    const celltype = dom.tagName.toLowerCase();
+    const widthAttr = dom.getAttribute('data-colwidth');
+    const widths = widthAttr && /^\d+(,\d+)*$/.test(widthAttr)
+        ? widthAttr.split(',').map((s) => Number(s))
+        : null;
+    const colspan = Number(dom.getAttribute('colspan') || 1);
+    const valign = dom.getAttribute('valign');
+    const align = dom.getAttribute('align');
+    const scope = dom.getAttribute('scope');
+    const style = dom.getAttribute('style');
+    return {
+        celltype,
+        colspan,
+        rowspan: Number(dom.getAttribute('rowspan') || 1),
+        colwidth: widths && widths.length === colspan ? widths : null,
+        placeholder: dom.getAttribute('data-placeholder-text') || '',
+        styles: (0, table_cell_styles_1.getTableCellStyles)(dom.style),
+        valign,
+        align,
+        scope,
+        style,
+    };
+};
+exports.tableRow = {
+    content: 'table_cell+',
+    tableRole: 'row',
+    attrs: {
+        placeholder: { default: '' },
+    },
+    parseDOM: [
+        {
+            tag: 'tr',
+            priority: 80,
+        },
+    ],
+    toDOM: (node) => {
+        const tableRowNode = node;
+        const attrs = {};
+        if (tableRowNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableRowNode.attrs.placeholder;
+        }
+        return ['tr', attrs, 0];
+    },
+};
+exports.tableCell = {
+    content: 'inline*',
+    attrs: {
+        celltype: { default: 'td' },
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+        placeholder: { default: 'Data' },
+        styles: { default: {} },
+        valign: { default: null },
+        align: { default: null },
+        scope: { default: null },
+        style: { default: null },
+    },
+    tableRole: 'cell',
+    isolating: true,
+    parseDOM: [
+        { tag: 'td', getAttrs: getCellAttrs },
+        { tag: 'th', getAttrs: getCellAttrs },
+    ],
+    toDOM: (node) => {
+        const tableCellNode = node;
+        const attrs = {};
+        const tag = tableCellNode.attrs.celltype;
+        if (tableCellNode.attrs.colspan && tableCellNode.attrs.colspan !== 1) {
+            attrs.colspan = String(tableCellNode.attrs.colspan);
+        }
+        if (tableCellNode.attrs.rowspan && tableCellNode.attrs.rowspan !== 1) {
+            attrs.rowspan = String(tableCellNode.attrs.rowspan);
+        }
+        if (tableCellNode.attrs.colwidth) {
+            attrs['data-colwidth'] = tableCellNode.attrs.colwidth.join(',');
+        }
+        if (tableCellNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableCellNode.attrs.placeholder;
+        }
+        if (!tableCellNode.textContent) {
+            attrs.class = 'placeholder';
+        }
+        const styleString = (0, table_cell_styles_1.serializeTableCellStyles)(tableCellNode.attrs.styles);
+        if (styleString) {
+            attrs.style = styleString;
+        }
+        if (tableCellNode.attrs.valign) {
+            attrs.valign = tableCellNode.attrs.valign;
+        }
+        if (tableCellNode.attrs.align) {
+            attrs.align = tableCellNode.attrs.align;
+        }
+        if (tableCellNode.attrs.scope) {
+            attrs.scope = tableCellNode.attrs.scope;
+        }
+        if (tableCellNode.attrs.style) {
+            attrs.style = tableCellNode.attrs.style;
+        }
+        return [tag, attrs, 0];
+    },
+};

package/dist/cjs/transformer/decode.js

@@ -569,19 +569,13 @@ class Decoder {
             [json_schema_1.ObjectTypes.TableElement]: (data) => {
                 const model = data;
                 const table = this.createTable(model);
-                const tableColGroup = this.createTableColGroup(model);
                 const tableElementFooter = this.createTableElementFooter(model);
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
                 comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = [table];
-                if (tableColGroup) {
-                    content.unshift(tableColGroup);
-                }
-                if (tableElementFooter) {
-                    content.push(tableElementFooter);
-                }
-                content.push(figcaption);
+                const content = tableElementFooter
+                    ? [table, tableElementFooter, figcaption]
+                    : [table, figcaption];
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -795,16 +789,6 @@ class Decoder {
         }
         return table;
     }
-    createTableColGroup(model) {
-        const tableId = model.containedObjectID;
-        const tableModel = this.getModel(tableId);
-        if (!tableModel || !tableModel.contents.includes('<colgroup>')) {
-            return undefined;
-        }
-        return this.parseContents(tableModel.contents, undefined, [], {
-            topNode: schema_1.schema.nodes.table_colgroup.create(),
-        });
-    }
     createTableElementFooter(model) {
         const tableElementFooterID = model.tableElementFooterID;
         if (!tableElementFooterID) {

package/dist/cjs/transformer/encode.js

@@ -115,9 +115,8 @@ function buildTableColGroup(cols) {
 }
 const tableContents = (node, parent) => {
     const input = serializer.serializeNode(node);
-    const parentInput = serializer.serializeNode(parent);
     const output = document.createElement('table');
-    const colgroup = buildTableColGroup(Array.from(parentInput.querySelectorAll('col')));
+    const colgroup = buildTableColGroup(Array.from(input.querySelectorAll('col')));
     if (colgroup) {
         output.appendChild(colgroup);
     }

package/dist/es/jats/importer/jats-body-dom-parser.js

@@ -524,6 +524,10 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'tbody',
+        skip: true,
+    },
     {
         tag: 'tfoot',
         skip: true,
@@ -558,12 +562,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_header',
+        node: 'table_cell',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            return Object.assign(Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
+            return Object.assign(Object.assign(Object.assign({ celltype: 'th' }, (colspan && { colspan })), (rowspan && { rowspan })), { valign: element.getAttribute('valign'), align: element.getAttribute('align'), scope: element.getAttribute('scope'), style: element.getAttribute('style') });
         },
     },
     {

package/dist/es/jats/importer/jats-front-parser.js

@@ -39,6 +39,11 @@ export const jatsFrontParser = {
         }
         return titles;
     },
+    parseDOI(front) {
+        var _a;
+        const doi = front === null || front === void 0 ? void 0 : front.querySelector('article-meta > article-id[pub-id-type="doi"]');
+        return (_a = doi === null || doi === void 0 ? void 0 : doi.textContent) !== null && _a !== void 0 ? _a : undefined;
+    },
     parseCounts(counts) {
         var _a, _b, _c, _d, _e;
         if (counts) {

package/dist/es/jats/importer/parse-jats-article.js

@@ -28,6 +28,7 @@ export const parseJATSFront = (doc, front) => {
     const createElement = createElementFn(doc);
     const journal = jatsFrontParser.parseJournal(front.querySelector('journal-meta'));
     const titles = jatsFrontParser.parseTitles(front.querySelector('article-meta > title-group'), createElement);
+    const DOI = jatsFrontParser.parseDOI(front);
     const { affiliations, affiliationIDs } = jatsFrontParser.parseAffiliations([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -42,7 +43,7 @@ export const parseJATSFront = (doc, front) => {
     ], affiliationIDs, footnoteIDs, correspondingIDs);
     const history = jatsFrontParser.parseDates(front.querySelector('article-meta > history'));
     const counts = jatsFrontParser.parseCounts(front.querySelector('article-meta counts'));
-    const manuscript = Object.assign(Object.assign(Object.assign({}, buildManuscript()), counts), history);
+    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, buildManuscript()), counts), history), { DOI });
     return generateIDs([
         manuscript,
         titles,

package/dist/es/jats/jats-exporter.js

@@ -303,10 +303,10 @@ export class JATSExporter {
                 articleID.textContent = id;
                 articleMeta.appendChild(articleID);
             }
-            if (doi) {
+            if (doi || manuscript.DOI) {
                 const articleID = this.document.createElement('article-id');
                 articleID.setAttribute('pub-id-type', 'doi');
-                articleID.textContent = doi;
+                articleID.textContent = doi !== null && doi !== void 0 ? doi : manuscript.DOI;
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
@@ -606,11 +606,6 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                table_header: (node) => [
-                    'th',
-                    Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
-                    0,
-                ],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -870,8 +865,9 @@ export class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
+                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    'td',
+                    node.attrs.celltype,
                     Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
                     0,
                 ],
@@ -952,26 +948,6 @@ export class JATSExporter {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
-            const appendTable = (element, node) => {
-                const tableNode = findChildNodeOfType(node, node.type.schema.nodes.table);
-                const colGroupNode = findChildNodeOfType(node, node.type.schema.nodes.table_colgroup);
-                if (!tableNode) {
-                    return;
-                }
-                const table = this.serializeNode(tableNode);
-                const tbodyElement = this.document.createElement('tbody');
-                while (table.firstChild) {
-                    const child = table.firstChild;
-                    table.removeChild(child);
-                    tbodyElement.appendChild(child);
-                }
-                table.appendChild(tbodyElement);
-                if (colGroupNode) {
-                    const colGroup = this.serializeNode(colGroupNode);
-                    table.insertBefore(colGroup, table.firstChild);
-                }
-                element.appendChild(table);
-            };
             const createFigureElement = (node, nodeName, contentNodeType, figType) => {
                 const element = createElement(node, nodeName);
                 if (figType) {
@@ -992,7 +968,7 @@ export class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendTable(element, node);
+                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.table_element_footer);
                 if (isExecutableNodeType(node.type)) {
                     processExecutableNode(node, element);

package/dist/es/schema/index.js

@@ -66,10 +66,11 @@ import { sectionLabel } from './nodes/section_label';
 import { sectionTitle } from './nodes/section_title';
 import { supplement } from './nodes/supplement';
 import { supplements } from './nodes/supplements';
-import { table, tableCell, tableHeader, tableRow } from './nodes/table';
+import { table, tableBody } from './nodes/table';
 import { tableCol, tableColGroup } from './nodes/table_col';
 import { tableElement } from './nodes/table_element';
 import { tableElementFooter } from './nodes/table_element_footer';
+import { tableCell, tableRow } from './nodes/table_row';
 import { text } from './nodes/text';
 import { title } from './nodes/title';
 import { tocElement } from './nodes/toc_element';
@@ -119,6 +120,7 @@ export * from './nodes/section_title';
 export * from './nodes/table';
 export * from './nodes/table_col';
 export * from './nodes/table_element';
+export * from './nodes/table_row';
 export * from './nodes/text';
 export * from './nodes/toc_element';
 export * from './nodes/toc_section';
@@ -194,6 +196,7 @@ export const schema = new Schema({
         section_title: sectionTitle,
         section_title_plain: sectionTitle,
         table,
+        table_body: tableBody,
         table_cell: tableCell,
         table_element: tableElement,
         table_row: tableRow,
@@ -210,6 +213,5 @@ export const schema = new Schema({
         contributors,
         supplements,
         supplement,
-        table_header: tableHeader,
     },
 });

package/dist/es/schema/nodes/table.js

@@ -13,77 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { tableNodes as createTableNodes, } from 'prosemirror-tables';
-const tableOptions = {
-    cellContent: 'inline*',
-    cellAttributes: {
-        placeholder: {
-            default: 'Data',
-            getFromDOM(dom) {
-                return dom.getAttribute('data-placeholder-text') || '';
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['data-placeholder-text'] = value;
-                }
-            },
-        },
-        valign: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('valign');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['valign'] = value;
-                }
-            },
-        },
-        align: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('align');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['align'] = value;
-                }
-            },
-        },
-        scope: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('scope');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['scope'] = value;
-                }
-            },
-        },
-        style: {
-            default: null,
-            getFromDOM(dom) {
-                return dom.getAttribute('style');
-            },
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['style'] = value;
-                }
-            },
-        },
-    },
-};
-const tableNodes = createTableNodes(tableOptions);
 export const table = {
+    content: 'table_colgroup? table_body',
+    tableRole: 'table',
+    isolating: true,
+    group: 'block',
+    selectable: false,
     attrs: {
         id: { default: '' },
+        headerRows: { default: 1 },
+        footerRows: { default: 1 },
         dataTracked: { default: null },
+        comments: { default: null },
     },
-    content: 'table_row+',
-    tableRole: 'table',
-    isolating: true,
-    group: 'block',
     parseDOM: [
         {
             tag: 'table',
@@ -91,20 +33,35 @@ export const table = {
                 const dom = p;
                 return {
                     id: dom.getAttribute('id'),
+                    headerRows: dom.dataset && dom.dataset['header-rows'],
+                    footerRows: dom.dataset && dom.dataset['footer-rows'],
                 };
             },
         },
     ],
-    toDOM(node) {
+    toDOM: (node) => {
+        const tableNode = node;
         return [
             'table',
             {
-                id: node.attrs.id,
+                id: tableNode.attrs.id,
+                'data-header-rows': String(node.attrs.headerRows),
+                'data-footer-rows': String(node.attrs.footerRows),
             },
-            ['tbody', 0],
+            0,
         ];
     },
 };
-export const tableRow = Object.assign(Object.assign({}, tableNodes.table_row), { attrs: Object.assign(Object.assign({}, tableNodes.table_row.attrs), { dataTracked: { default: null } }) });
-export const tableCell = Object.assign(Object.assign({}, tableNodes.table_cell), { attrs: Object.assign(Object.assign({}, tableNodes.table_cell.attrs), { dataTracked: { default: null } }) });
-export const tableHeader = Object.assign(Object.assign({}, tableNodes.table_header), { attrs: Object.assign(Object.assign({}, tableNodes.table_row.attrs), { dataTracked: { default: null } }) });
+export const tableBody = {
+    content: 'table_row+',
+    group: 'block',
+    tableRole: 'table',
+    parseDOM: [
+        {
+            tag: 'tbody',
+        },
+    ],
+    toDOM() {
+        return ['tbody', 0];
+    },
+};

package/dist/es/schema/nodes/table_element.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const tableElement = {
-    content: 'table_colgroup? (table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
+    content: '(table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
     attrs: {
         id: { default: '' },
         paragraphStyle: { default: '' },

package/dist/es/schema/nodes/table_row.js

@@ -0,0 +1,120 @@
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { getTableCellStyles, serializeTableCellStyles, } from '../../lib/table-cell-styles';
+const getCellAttrs = (p) => {
+    const dom = p;
+    const celltype = dom.tagName.toLowerCase();
+    const widthAttr = dom.getAttribute('data-colwidth');
+    const widths = widthAttr && /^\d+(,\d+)*$/.test(widthAttr)
+        ? widthAttr.split(',').map((s) => Number(s))
+        : null;
+    const colspan = Number(dom.getAttribute('colspan') || 1);
+    const valign = dom.getAttribute('valign');
+    const align = dom.getAttribute('align');
+    const scope = dom.getAttribute('scope');
+    const style = dom.getAttribute('style');
+    return {
+        celltype,
+        colspan,
+        rowspan: Number(dom.getAttribute('rowspan') || 1),
+        colwidth: widths && widths.length === colspan ? widths : null,
+        placeholder: dom.getAttribute('data-placeholder-text') || '',
+        styles: getTableCellStyles(dom.style),
+        valign,
+        align,
+        scope,
+        style,
+    };
+};
+export const tableRow = {
+    content: 'table_cell+',
+    tableRole: 'row',
+    attrs: {
+        placeholder: { default: '' },
+    },
+    parseDOM: [
+        {
+            tag: 'tr',
+            priority: 80,
+        },
+    ],
+    toDOM: (node) => {
+        const tableRowNode = node;
+        const attrs = {};
+        if (tableRowNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableRowNode.attrs.placeholder;
+        }
+        return ['tr', attrs, 0];
+    },
+};
+export const tableCell = {
+    content: 'inline*',
+    attrs: {
+        celltype: { default: 'td' },
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+        placeholder: { default: 'Data' },
+        styles: { default: {} },
+        valign: { default: null },
+        align: { default: null },
+        scope: { default: null },
+        style: { default: null },
+    },
+    tableRole: 'cell',
+    isolating: true,
+    parseDOM: [
+        { tag: 'td', getAttrs: getCellAttrs },
+        { tag: 'th', getAttrs: getCellAttrs },
+    ],
+    toDOM: (node) => {
+        const tableCellNode = node;
+        const attrs = {};
+        const tag = tableCellNode.attrs.celltype;
+        if (tableCellNode.attrs.colspan && tableCellNode.attrs.colspan !== 1) {
+            attrs.colspan = String(tableCellNode.attrs.colspan);
+        }
+        if (tableCellNode.attrs.rowspan && tableCellNode.attrs.rowspan !== 1) {
+            attrs.rowspan = String(tableCellNode.attrs.rowspan);
+        }
+        if (tableCellNode.attrs.colwidth) {
+            attrs['data-colwidth'] = tableCellNode.attrs.colwidth.join(',');
+        }
+        if (tableCellNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableCellNode.attrs.placeholder;
+        }
+        if (!tableCellNode.textContent) {
+            attrs.class = 'placeholder';
+        }
+        const styleString = serializeTableCellStyles(tableCellNode.attrs.styles);
+        if (styleString) {
+            attrs.style = styleString;
+        }
+        if (tableCellNode.attrs.valign) {
+            attrs.valign = tableCellNode.attrs.valign;
+        }
+        if (tableCellNode.attrs.align) {
+            attrs.align = tableCellNode.attrs.align;
+        }
+        if (tableCellNode.attrs.scope) {
+            attrs.scope = tableCellNode.attrs.scope;
+        }
+        if (tableCellNode.attrs.style) {
+            attrs.style = tableCellNode.attrs.style;
+        }
+        return [tag, attrs, 0];
+    },
+};

package/dist/es/transformer/decode.js

@@ -560,19 +560,13 @@ export class Decoder {
             [ObjectTypes.TableElement]: (data) => {
                 const model = data;
                 const table = this.createTable(model);
-                const tableColGroup = this.createTableColGroup(model);
                 const tableElementFooter = this.createTableElementFooter(model);
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
                 comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = [table];
-                if (tableColGroup) {
-                    content.unshift(tableColGroup);
-                }
-                if (tableElementFooter) {
-                    content.push(tableElementFooter);
-                }
-                content.push(figcaption);
+                const content = tableElementFooter
+                    ? [table, tableElementFooter, figcaption]
+                    : [table, figcaption];
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -786,16 +780,6 @@ export class Decoder {
         }
         return table;
     }
-    createTableColGroup(model) {
-        const tableId = model.containedObjectID;
-        const tableModel = this.getModel(tableId);
-        if (!tableModel || !tableModel.contents.includes('<colgroup>')) {
-            return undefined;
-        }
-        return this.parseContents(tableModel.contents, undefined, [], {
-            topNode: schema.nodes.table_colgroup.create(),
-        });
-    }
     createTableElementFooter(model) {
         const tableElementFooterID = model.tableElementFooterID;
         if (!tableElementFooterID) {

package/dist/es/transformer/encode.js

@@ -107,9 +107,8 @@ function buildTableColGroup(cols) {
 }
 const tableContents = (node, parent) => {
     const input = serializer.serializeNode(node);
-    const parentInput = serializer.serializeNode(parent);
     const output = document.createElement('table');
-    const colgroup = buildTableColGroup(Array.from(parentInput.querySelectorAll('col')));
+    const colgroup = buildTableColGroup(Array.from(input.querySelectorAll('col')));
     if (colgroup) {
         output.appendChild(colgroup);
     }

package/dist/types/jats/importer/jats-front-parser.d.ts

@@ -15,6 +15,7 @@
  */
 export declare const jatsFrontParser: {
     parseTitles(element: Element | null, createElement: (tagName: string) => HTMLElement): import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Titles>;
+    parseDOI(front: Element | null): string | undefined;
     parseCounts(counts: Element | null): {
         wordCount: number | undefined;
         figureCount: number | undefined;

package/dist/types/schema/index.d.ts

@@ -60,6 +60,7 @@ export * from './nodes/section_title';
 export * from './nodes/table';
 export * from './nodes/table_col';
 export * from './nodes/table_element';
+export * from './nodes/table_row';
 export * from './nodes/text';
 export * from './nodes/toc_element';
 export * from './nodes/toc_section';

package/dist/types/schema/nodes/table.d.ts

@@ -13,77 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { NodeSpec } from 'prosemirror-model';
-export declare const table: NodeSpec;
-export declare const tableRow: {
+import { ManuscriptNode, TableNodeSpec } from '../types';
+import { CommentNode } from './comment';
+export interface TableNode extends ManuscriptNode {
     attrs: {
-        dataTracked: {
-            default: null;
-        };
+        id: string;
+        headerRows: number;
+        footerRows: number;
+        comments?: CommentNode[];
     };
-    content?: string | undefined;
-    marks?: string | undefined;
-    group?: string | undefined;
-    inline?: boolean | undefined;
-    atom?: boolean | undefined;
-    selectable?: boolean | undefined;
-    draggable?: boolean | undefined;
-    code?: boolean | undefined;
-    whitespace?: "pre" | "normal" | undefined;
-    definingAsContext?: boolean | undefined;
-    definingForContent?: boolean | undefined;
-    defining?: boolean | undefined;
-    isolating?: boolean | undefined;
-    toDOM?: ((node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec) | undefined;
-    parseDOM?: readonly import("prosemirror-model").ParseRule[] | undefined;
-    toDebugString?: ((node: import("prosemirror-model").Node) => string) | undefined;
-    leafText?: ((node: import("prosemirror-model").Node) => string) | undefined;
-};
-export declare const tableCell: {
-    attrs: {
-        dataTracked: {
-            default: null;
-        };
-    };
-    content?: string | undefined;
-    marks?: string | undefined;
-    group?: string | undefined;
-    inline?: boolean | undefined;
-    atom?: boolean | undefined;
-    selectable?: boolean | undefined;
-    draggable?: boolean | undefined;
-    code?: boolean | undefined;
-    whitespace?: "pre" | "normal" | undefined;
-    definingAsContext?: boolean | undefined;
-    definingForContent?: boolean | undefined;
-    defining?: boolean | undefined;
-    isolating?: boolean | undefined;
-    toDOM?: ((node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec) | undefined;
-    parseDOM?: readonly import("prosemirror-model").ParseRule[] | undefined;
-    toDebugString?: ((node: import("prosemirror-model").Node) => string) | undefined;
-    leafText?: ((node: import("prosemirror-model").Node) => string) | undefined;
-};
-export declare const tableHeader: {
-    attrs: {
-        dataTracked: {
-            default: null;
-        };
-    };
-    content?: string | undefined;
-    marks?: string | undefined;
-    group?: string | undefined;
-    inline?: boolean | undefined;
-    atom?: boolean | undefined;
-    selectable?: boolean | undefined;
-    draggable?: boolean | undefined;
-    code?: boolean | undefined;
-    whitespace?: "pre" | "normal" | undefined;
-    definingAsContext?: boolean | undefined;
-    definingForContent?: boolean | undefined;
-    defining?: boolean | undefined;
-    isolating?: boolean | undefined;
-    toDOM?: ((node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec) | undefined;
-    parseDOM?: readonly import("prosemirror-model").ParseRule[] | undefined;
-    toDebugString?: ((node: import("prosemirror-model").Node) => string) | undefined;
-    leafText?: ((node: import("prosemirror-model").Node) => string) | undefined;
-};
+}
+export declare const table: TableNodeSpec;
+export declare const tableBody: TableNodeSpec;

package/dist/types/schema/nodes/table_row.d.ts

@@ -0,0 +1,41 @@
+/*!
+ * © 2019 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TableCellStyleKey } from '../../lib/table-cell-styles';
+import { ManuscriptNode, TableNodeSpec } from '../types';
+export interface TableRowNode extends ManuscriptNode {
+    attrs: {
+        placeholder: string;
+    };
+}
+export declare const tableRow: TableNodeSpec;
+export type TableCellStyles = {
+    [key in TableCellStyleKey]?: string | null;
+};
+export interface TableCellNode extends ManuscriptNode {
+    attrs: {
+        celltype: 'td' | 'th';
+        colspan: number | null;
+        rowspan: number | null;
+        colwidth: number[] | null;
+        placeholder: string | null;
+        styles: TableCellStyles;
+        valign: string | null;
+        align: string | null;
+        scope: string | null;
+        style: string | null;
+    };
+}
+export declare const tableCell: TableNodeSpec;

package/dist/types/schema/types.d.ts

@@ -17,7 +17,7 @@ import { Fragment, Mark as ProsemirrorMark, MarkType, Node as ProsemirrorNode, N
 import { EditorState, NodeSelection, Plugin, TextSelection, Transaction } from 'prosemirror-state';
 import { EditorView, NodeView } from 'prosemirror-view';
 export type Marks = 'bold' | 'code' | 'italic' | 'smallcaps' | 'strikethrough' | 'styled' | 'subscript' | 'superscript' | 'underline' | 'tracked_insert' | 'tracked_delete';
-export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'bullet_list' | 'caption' | 'caption_title' | 'comment' | 'comments' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keyword_group' | 'keywords' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'abstracts' | 'body' | 'backmatter' | 'missing_figure' | 'ordered_list' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'table_header';
+export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'bullet_list' | 'caption' | 'caption_title' | 'comment' | 'comments' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keyword_group' | 'keywords' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'abstracts' | 'body' | 'backmatter' | 'missing_figure' | 'ordered_list' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_body' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement';
 export type ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

package/dist/types/transformer/decode.d.ts

@@ -43,7 +43,6 @@ export declare class Decoder {
     private getManuscriptID;
     private getFigcaption;
     private createTable;
-    private createTableColGroup;
     private createTableElementFooter;
     private createListing;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.1-LEAN-3336-19",
+  "version": "2.1.1-LEAN-3352-0",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -35,8 +35,7 @@
     "jszip": "^3.10.1",
     "mathjax-full": "^3.2.2",
     "mime": "^3.0.0",
-    "prosemirror-model": "^1.8.1",
-    "prosemirror-tables": "^1.3.5",
+    "prosemirror-model": "^1.18.3",
     "uuid": "^9.0.0",
     "w3c-xmlserializer": "^4.0.0"
   },
@@ -65,9 +64,9 @@
     "eslint-plugin-mdx": "^2.0.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
     "husky": "^8.0.2",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
@@ -79,4 +78,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}