@manuscripts/transform 2.1.1-LEAN-3377-1 → 2.1.1-LEAN-3336-23

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

@@ -525,23 +525,9 @@ const nodes = [
             const element = node;
             return {
                 id: element.getAttribute('id'),
-                suppressFooter: !element.querySelector('table > tfoot > tr'),
-                suppressHeader: !element.querySelector('table > thead > tr'),
             };
         },
     },
-    {
-        tag: 'tbody',
-        skip: true,
-    },
-    {
-        tag: 'tfoot',
-        skip: true,
-    },
-    {
-        tag: 'thead',
-        skip: true,
-    },
     {
         tag: 'title',
         node: 'section_title',
@@ -568,12 +554,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            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') });
+            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') });
         },
     },
     {

package/dist/cjs/jats/importer/jats-body-transformations.js

@@ -239,8 +239,12 @@ exports.jatsBodyTransformations = {
         }
     },
     fixTables(body, createElement) {
-        const tables = body.querySelectorAll('table-wrap > table');
-        tables.forEach((table) => {
+        const tableWraps = body.querySelectorAll('table-wrap');
+        tableWraps.forEach((tableWrap) => {
+            const table = tableWrap.querySelector('table');
+            if (!table) {
+                return;
+            }
             const colgroup = table.querySelector('colgroup');
             const cols = table.querySelectorAll('col');
             if (!colgroup && table.firstChild && cols.length > 0) {
@@ -248,20 +252,7 @@ exports.jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                table.insertBefore(colgroup, table.firstChild);
-            }
-            const tbody = table.querySelector('tbody');
-            if (tbody) {
-                const headerRow = table.querySelector('thead > tr');
-                if (!headerRow) {
-                    const tr = createElement('tr');
-                    tbody.insertBefore(tr, tbody.firstElementChild);
-                }
-                const footerRow = table.querySelector('tfoot > tr');
-                if (!footerRow) {
-                    const tr = createElement('tr');
-                    tbody.appendChild(tr);
-                }
+                tableWrap.insertBefore(colgroup, tableWrap.firstChild);
             }
         });
     },

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

@@ -873,9 +873,13 @@ class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
-                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    node.attrs.celltype,
+                    'td',
+                    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,
+                ],
+                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,
                 ],
@@ -956,6 +960,26 @@ 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) {
@@ -976,7 +1000,7 @@ class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
+                appendTable(element, node);
                 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,7 +87,6 @@ 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");
@@ -137,7 +136,6 @@ __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);
@@ -213,10 +211,9 @@ 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_body: table_1.tableBody,
-        table_cell: table_row_1.tableCell,
+        table_cell: table_1.tableCell,
         table_element: table_element_1.tableElement,
-        table_row: table_row_1.tableRow,
+        table_row: table_1.tableRow,
         table_col: table_col_1.tableCol,
         table_colgroup: table_col_1.tableColGroup,
         text: text_1.text,
@@ -230,5 +227,6 @@ 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,20 +15,57 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableBody = exports.table = void 0;
+exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = void 0;
+const prosemirror_tables_1 = require("prosemirror-tables");
+function createCellAttribute(attributeName, defaultValue = null, customGetFromDOM, customSetDOMAttr) {
+    return {
+        default: defaultValue,
+        getFromDOM(dom) {
+            if (customGetFromDOM) {
+                return customGetFromDOM(dom);
+            }
+            return dom.getAttribute(attributeName);
+        },
+        setDOMAttr(value, attrs) {
+            if (customSetDOMAttr) {
+                customSetDOMAttr(value, attrs);
+            }
+            else if (value) {
+                attrs[attributeName] = value;
+            }
+        },
+    };
+}
+const tableOptions = {
+    cellContent: 'inline*',
+    cellAttributes: {
+        placeholder: createCellAttribute('data-placeholder-text', 'Data', (dom) => dom.getAttribute('data-placeholder-text') || ''),
+        valign: createCellAttribute('valign'),
+        align: createCellAttribute('align'),
+        scope: createCellAttribute('scope'),
+        style: createCellAttribute('style'),
+        colspan: createCellAttribute('colspan', 1, (dom) => Number(dom.getAttribute('colspan') || 1), (value, attrs) => {
+            if (value && value !== 1) {
+                attrs['colspan'] = String(value);
+            }
+        }),
+        rowspan: createCellAttribute('rowspan', 1, (dom) => Number(dom.getAttribute('rowspan') || 1), (value, attrs) => {
+            if (value && value !== 1) {
+                attrs['rowspan'] = String(value);
+            }
+        }),
+    },
+};
+const tableNodes = (0, prosemirror_tables_1.tableNodes)(tableOptions);
 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',
@@ -36,35 +73,20 @@ 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) => {
-        const tableNode = node;
+    toDOM(node) {
         return [
             'table',
             {
-                id: tableNode.attrs.id,
-                'data-header-rows': String(node.attrs.headerRows),
-                'data-footer-rows': String(node.attrs.footerRows),
+                id: node.attrs.id,
             },
-            0,
+            ['tbody', 0],
         ];
     },
 };
-exports.tableBody = {
-    content: 'table_row+',
-    group: 'block',
-    tableRole: 'table',
-    parseDOM: [
-        {
-            tag: 'tbody',
-        },
-    ],
-    toDOM() {
-        return ['tbody', 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_header.attrs), { dataTracked: { default: null } }) });

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 | placeholder) table_element_footer? figcaption? (listing | placeholder)',
+    content: 'table_colgroup? (table | placeholder) table_element_footer? figcaption? (listing | placeholder)',
     attrs: {
         id: { default: '' },
         paragraphStyle: { default: '' },

package/dist/cjs/transformer/decode.js

@@ -557,25 +557,28 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.Table]: (data) => {
                 const model = data;
-                const comments = this.createCommentNodes(model);
-                comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                return this.parseContents(model.contents, undefined, this.getComments(model), {
+                return this.parseContents(model.contents, undefined, [], {
                     topNode: schema_1.schema.nodes.table.create({
                         id: model._id,
-                        comments: comments.map((c) => c.attrs.id),
                     }),
                 });
             },
             [json_schema_1.ObjectTypes.TableElement]: (data) => {
                 const model = data;
                 const table = this.createTable(model);
-                const tableElementFooter = this.createTableElementFooter(model, table);
+                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 = tableElementFooter
-                    ? [table, tableElementFooter, figcaption]
-                    : [table, figcaption];
+                const content = [table];
+                if (tableColGroup) {
+                    content.unshift(tableColGroup);
+                }
+                if (tableElementFooter) {
+                    content.push(tableElementFooter);
+                }
+                content.push(figcaption);
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -789,14 +792,24 @@ class Decoder {
         }
         return table;
     }
-    createTableElementFooter(model, 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) {
             return undefined;
         }
         const tableElementFooterModel = this.getModel(tableElementFooterID);
         return tableElementFooterModel
-            ? this.moveUncitedFootnoteAtEnd(this.decode(tableElementFooterModel), table)
+            ? this.decode(tableElementFooterModel)
             : undefined;
     }
     createListing(id) {
@@ -814,24 +827,5 @@ class Decoder {
             throw new errors_1.MissingElement(id);
         }
     }
-    moveUncitedFootnoteAtEnd(tableElementFooter, table) {
-        const tableInlineFootnoteIds = new Set();
-        table.descendants((node) => {
-            if (node.type === schema_1.schema.nodes.inline_footnote) {
-                ;
-                node.attrs.rids.map((rid) => tableInlineFootnoteIds.add(rid));
-            }
-        });
-        tableElementFooter.forEach((footnoteElement, offset) => {
-            if (footnoteElement.type !== schema_1.schema.nodes.footnotes_element) {
-                return;
-            }
-            const children = [];
-            footnoteElement.content.forEach((node) => children.push(node));
-            children.sort((child) => tableInlineFootnoteIds.has(child.attrs.id) ? -1 : 0);
-            tableElementFooter = tableElementFooter.replace(offset, offset + footnoteElement.nodeSize, new prosemirror_model_1.Slice(prosemirror_model_1.Fragment.from(footnoteElement.copy(prosemirror_model_1.Fragment.from(children))), tableElementFooter.resolve(offset).depth, tableElementFooter.resolve(offset + footnoteElement.nodeSize).depth));
-        });
-        return tableElementFooter;
-    }
 }
 exports.Decoder = Decoder;

package/dist/cjs/transformer/encode.js

@@ -115,8 +115,9 @@ 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(input.querySelectorAll('col')));
+    const colgroup = buildTableColGroup(Array.from(parentInput.querySelectorAll('col')));
     if (colgroup) {
         output.appendChild(colgroup);
     }

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

@@ -519,23 +519,9 @@ const nodes = [
             const element = node;
             return {
                 id: element.getAttribute('id'),
-                suppressFooter: !element.querySelector('table > tfoot > tr'),
-                suppressHeader: !element.querySelector('table > thead > tr'),
             };
         },
     },
-    {
-        tag: 'tbody',
-        skip: true,
-    },
-    {
-        tag: 'tfoot',
-        skip: true,
-    },
-    {
-        tag: 'thead',
-        skip: true,
-    },
     {
         tag: 'title',
         node: 'section_title',
@@ -562,12 +548,12 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');
             const rowspan = element.getAttribute('rowspan');
-            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') });
+            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') });
         },
     },
     {

package/dist/es/jats/importer/jats-body-transformations.js

@@ -236,8 +236,12 @@ export const jatsBodyTransformations = {
         }
     },
     fixTables(body, createElement) {
-        const tables = body.querySelectorAll('table-wrap > table');
-        tables.forEach((table) => {
+        const tableWraps = body.querySelectorAll('table-wrap');
+        tableWraps.forEach((tableWrap) => {
+            const table = tableWrap.querySelector('table');
+            if (!table) {
+                return;
+            }
             const colgroup = table.querySelector('colgroup');
             const cols = table.querySelectorAll('col');
             if (!colgroup && table.firstChild && cols.length > 0) {
@@ -245,20 +249,7 @@ export const jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                table.insertBefore(colgroup, table.firstChild);
-            }
-            const tbody = table.querySelector('tbody');
-            if (tbody) {
-                const headerRow = table.querySelector('thead > tr');
-                if (!headerRow) {
-                    const tr = createElement('tr');
-                    tbody.insertBefore(tr, tbody.firstElementChild);
-                }
-                const footerRow = table.querySelector('tfoot > tr');
-                if (!footerRow) {
-                    const tr = createElement('tr');
-                    tbody.appendChild(tr);
-                }
+                tableWrap.insertBefore(colgroup, tableWrap.firstChild);
             }
         });
     },

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

@@ -865,9 +865,13 @@ export class JATSExporter {
                     element.setAttribute('position', 'anchor');
                     return element;
                 },
-                table_body: () => ['tbody', 0],
                 table_cell: (node) => [
-                    node.attrs.celltype,
+                    'td',
+                    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,
+                ],
+                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,
                 ],
@@ -948,6 +952,26 @@ 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) {
@@ -968,7 +992,7 @@ export class JATSExporter {
                 const element = createElement(node, nodeName);
                 appendLabels(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.figcaption);
-                appendChildNodeOfType(element, node, node.type.schema.nodes.table);
+                appendTable(element, node);
                 appendChildNodeOfType(element, node, node.type.schema.nodes.table_element_footer);
                 if (isExecutableNodeType(node.type)) {
                     processExecutableNode(node, element);

package/dist/es/schema/index.js

@@ -66,11 +66,10 @@ import { sectionLabel } from './nodes/section_label';
 import { sectionTitle } from './nodes/section_title';
 import { supplement } from './nodes/supplement';
 import { supplements } from './nodes/supplements';
-import { table, tableBody } from './nodes/table';
+import { table, tableCell, tableHeader, tableRow } 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';
@@ -120,7 +119,6 @@ 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';
@@ -196,7 +194,6 @@ 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,
@@ -213,5 +210,6 @@ export const schema = new Schema({
         contributors,
         supplements,
         supplement,
+        table_header: tableHeader,
     },
 });

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

@@ -13,19 +13,56 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { tableNodes as createTableNodes, } from 'prosemirror-tables';
+function createCellAttribute(attributeName, defaultValue = null, customGetFromDOM, customSetDOMAttr) {
+    return {
+        default: defaultValue,
+        getFromDOM(dom) {
+            if (customGetFromDOM) {
+                return customGetFromDOM(dom);
+            }
+            return dom.getAttribute(attributeName);
+        },
+        setDOMAttr(value, attrs) {
+            if (customSetDOMAttr) {
+                customSetDOMAttr(value, attrs);
+            }
+            else if (value) {
+                attrs[attributeName] = value;
+            }
+        },
+    };
+}
+const tableOptions = {
+    cellContent: 'inline*',
+    cellAttributes: {
+        placeholder: createCellAttribute('data-placeholder-text', 'Data', (dom) => dom.getAttribute('data-placeholder-text') || ''),
+        valign: createCellAttribute('valign'),
+        align: createCellAttribute('align'),
+        scope: createCellAttribute('scope'),
+        style: createCellAttribute('style'),
+        colspan: createCellAttribute('colspan', 1, (dom) => Number(dom.getAttribute('colspan') || 1), (value, attrs) => {
+            if (value && value !== 1) {
+                attrs['colspan'] = String(value);
+            }
+        }),
+        rowspan: createCellAttribute('rowspan', 1, (dom) => Number(dom.getAttribute('rowspan') || 1), (value, attrs) => {
+            if (value && value !== 1) {
+                attrs['rowspan'] = String(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',
@@ -33,35 +70,20 @@ 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) => {
-        const tableNode = node;
+    toDOM(node) {
         return [
             'table',
             {
-                id: tableNode.attrs.id,
-                'data-header-rows': String(node.attrs.headerRows),
-                'data-footer-rows': String(node.attrs.footerRows),
+                id: node.attrs.id,
             },
-            0,
+            ['tbody', 0],
         ];
     },
 };
-export const tableBody = {
-    content: 'table_row+',
-    group: 'block',
-    tableRole: 'table',
-    parseDOM: [
-        {
-            tag: 'tbody',
-        },
-    ],
-    toDOM() {
-        return ['tbody', 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_header.attrs), { dataTracked: { default: null } }) });

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

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

package/dist/es/transformer/decode.js

@@ -26,7 +26,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { ObjectTypes, } from '@manuscripts/json-schema';
 import debug from 'debug';
-import { DOMParser, Fragment, Slice } from 'prosemirror-model';
+import { DOMParser } from 'prosemirror-model';
 import { MissingElement } from '../errors';
 import { abstractsType, backmatterType, bodyType, } from '../lib/section-group-type';
 import { schema, } from '../schema';
@@ -548,25 +548,28 @@ export class Decoder {
             },
             [ObjectTypes.Table]: (data) => {
                 const model = data;
-                const comments = this.createCommentNodes(model);
-                comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                return this.parseContents(model.contents, undefined, this.getComments(model), {
+                return this.parseContents(model.contents, undefined, [], {
                     topNode: schema.nodes.table.create({
                         id: model._id,
-                        comments: comments.map((c) => c.attrs.id),
                     }),
                 });
             },
             [ObjectTypes.TableElement]: (data) => {
                 const model = data;
                 const table = this.createTable(model);
-                const tableElementFooter = this.createTableElementFooter(model, table);
+                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 = tableElementFooter
-                    ? [table, tableElementFooter, figcaption]
-                    : [table, figcaption];
+                const content = [table];
+                if (tableColGroup) {
+                    content.unshift(tableColGroup);
+                }
+                if (tableElementFooter) {
+                    content.push(tableElementFooter);
+                }
+                content.push(figcaption);
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -780,14 +783,24 @@ export class Decoder {
         }
         return table;
     }
-    createTableElementFooter(model, 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) {
             return undefined;
         }
         const tableElementFooterModel = this.getModel(tableElementFooterID);
         return tableElementFooterModel
-            ? this.moveUncitedFootnoteAtEnd(this.decode(tableElementFooterModel), table)
+            ? this.decode(tableElementFooterModel)
             : undefined;
     }
     createListing(id) {
@@ -805,23 +818,4 @@ export class Decoder {
             throw new MissingElement(id);
         }
     }
-    moveUncitedFootnoteAtEnd(tableElementFooter, table) {
-        const tableInlineFootnoteIds = new Set();
-        table.descendants((node) => {
-            if (node.type === schema.nodes.inline_footnote) {
-                ;
-                node.attrs.rids.map((rid) => tableInlineFootnoteIds.add(rid));
-            }
-        });
-        tableElementFooter.forEach((footnoteElement, offset) => {
-            if (footnoteElement.type !== schema.nodes.footnotes_element) {
-                return;
-            }
-            const children = [];
-            footnoteElement.content.forEach((node) => children.push(node));
-            children.sort((child) => tableInlineFootnoteIds.has(child.attrs.id) ? -1 : 0);
-            tableElementFooter = tableElementFooter.replace(offset, offset + footnoteElement.nodeSize, new Slice(Fragment.from(footnoteElement.copy(Fragment.from(children))), tableElementFooter.resolve(offset).depth, tableElementFooter.resolve(offset + footnoteElement.nodeSize).depth));
-        });
-        return tableElementFooter;
-    }
 }

package/dist/es/transformer/encode.js

@@ -107,8 +107,9 @@ 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(input.querySelectorAll('col')));
+    const colgroup = buildTableColGroup(Array.from(parentInput.querySelectorAll('col')));
     if (colgroup) {
         output.appendChild(colgroup);
     }

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

@@ -60,7 +60,6 @@ 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,15 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptNode, TableNodeSpec } from '../types';
-import { CommentNode } from './comment';
-export interface TableNode extends ManuscriptNode {
-    attrs: {
-        id: string;
-        headerRows: number;
-        footerRows: number;
-        comments?: CommentNode[];
-    };
-}
-export declare const table: TableNodeSpec;
-export declare const tableBody: TableNodeSpec;
+import { NodeSpec } from 'prosemirror-model';
+export declare const table: NodeSpec;
+export declare const tableRow: NodeSpec;
+export declare const tableCell: NodeSpec;
+export declare const tableHeader: NodeSpec;

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_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 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 ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.1-LEAN-3377-1",
+  "version": "2.1.1-LEAN-3336-23",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -36,6 +36,7 @@
     "mathjax-full": "^3.2.2",
     "mime": "^3.0.0",
     "prosemirror-model": "^1.18.3",
+    "prosemirror-tables": "^1.3.5",
     "uuid": "^9.0.0",
     "w3c-xmlserializer": "^4.0.0"
   },
@@ -64,9 +65,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",

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

@@ -1,123 +0,0 @@
-"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/es/schema/nodes/table_row.js

@@ -1,120 +0,0 @@
-/*!
- * © 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/types/schema/nodes/table_row.d.ts

@@ -1,41 +0,0 @@
-/*!
- * © 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;