@manuscripts/transform 2.1.1-LEAN-3336-4 → 2.1.1-LEAN-3336-7

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

@@ -530,10 +530,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'tbody',
-        skip: true,
-    },
     {
         tag: 'tfoot',
         skip: true,
@@ -573,7 +569,7 @@ const nodes = [
             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') });
         },
     },
     {
@@ -586,10 +582,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'colgroup',
-        node: 'table_colgroup',
-    },
     {
         tag: 'xref[ref-type="bibr"]',
         node: 'citation',

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

@@ -241,6 +241,7 @@ exports.jatsBodyTransformations = {
     fixTables(body, createElement) {
         const tables = body.querySelectorAll('table-wrap > table');
         tables.forEach((table) => {
+            var _a;
             const colgroup = table.querySelector('colgroup');
             const cols = table.querySelectorAll('col');
             if (!colgroup && table.firstChild && cols.length > 0) {
@@ -248,20 +249,19 @@ exports.jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                table.insertBefore(colgroup, table.firstChild);
+                (_a = table.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(colgroup, table);
+            }
+            const rows = table.querySelectorAll('tr');
+            for (const row of rows) {
+                table.appendChild(row);
+            }
+            const thead = table.querySelector('thead');
+            if (thead) {
+                table.removeChild(thead);
             }
             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);
-                }
+                table.removeChild(tbody);
             }
         });
     },

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

@@ -73,7 +73,8 @@ const parseJATSBody = (doc, body, references) => {
     }
     const replacements = new Map(references === null || references === void 0 ? void 0 : references.IDs);
     (0, jats_parser_utils_1.updateDocumentIDs)(node, replacements);
-    return (0, transformer_1.encode)(node).values();
+    const models = (0, transformer_1.encode)(node);
+    return models.values();
 };
 exports.parseJATSBody = parseJATSBody;
 const createBibliographyModels = (references) => {

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

@@ -615,7 +615,7 @@ class JATSExporter {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
                 table_header: (node) => [
-                    node.attrs.celltype,
+                    '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,
                 ],
@@ -879,7 +879,7 @@ class JATSExporter {
                     return element;
                 },
                 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,
                 ],
@@ -960,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 = 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) {
@@ -980,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,9 +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_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,
@@ -229,6 +227,6 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
-        table_header: table_row_1.tableHeader,
+        table_header: table_1.tableHeader,
     },
 });

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

@@ -15,43 +15,84 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.table = void 0;
-exports.table = {
-    content: 'table_row+',
-    tableRole: 'table',
-    isolating: true,
-    group: 'block',
-    selectable: false,
-    attrs: {
-        id: { default: '' },
-        headerRows: { default: 1 },
-        footerRows: { default: 1 },
-        dataTracked: { default: null },
-        comments: { default: null },
-    },
-    parseDOM: [
-        {
-            tag: 'table',
-            getAttrs: (p) => {
-                const dom = p;
-                return {
-                    id: dom.getAttribute('id'),
-                    headerRows: dom.dataset && dom.dataset['header-rows'],
-                    footerRows: dom.dataset && dom.dataset['footer-rows'],
-                };
+exports.tableHeader = exports.tableRow = exports.tableCell = exports.table = exports.tableNodes = void 0;
+const prosemirror_tables_1 = require("prosemirror-tables");
+const table_cell_styles_1 = require("../../lib/table-cell-styles");
+const tableOptions = {
+    tableGroup: 'block',
+    cellContent: 'inline*',
+    cellAttributes: {
+        placeholder: {
+            default: 'Data',
+            getFromDOM(dom) {
+                return dom.getAttribute('data-placeholder-text') || '';
+            },
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['data-placeholder-text'] = value;
+                }
+            },
+        },
+        styles: {
+            default: {},
+            getFromDOM(dom) {
+                return (0, table_cell_styles_1.getTableCellStyles)(dom.style);
+            },
+            setDOMAttr(value, attrs) {
+                const styleString = (0, table_cell_styles_1.serializeTableCellStyles)(value);
+                if (styleString) {
+                    attrs['style'] = 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;
+                }
             },
         },
-    ],
-    toDOM: (node) => {
-        const tableNode = node;
-        return [
-            'table',
-            {
-                id: tableNode.attrs.id,
-                'data-header-rows': String(node.attrs.headerRows),
-                'data-footer-rows': String(node.attrs.footerRows),
-            },
-            0,
-        ];
     },
 };
+exports.tableNodes = (0, prosemirror_tables_1.tableNodes)(tableOptions);
+exports.table = Object.assign(Object.assign({}, exports.tableNodes.table), { attrs: Object.assign(Object.assign({}, exports.tableNodes.table.attrs), { id: { default: '' } }) });
+exports.tableCell = exports.tableNodes.table_cell;
+exports.tableRow = exports.tableNodes.table_row;
+exports.tableHeader = exports.tableNodes.table_header;

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/schema/nodes/table_row.js

@@ -1,6 +1,6 @@
 "use strict";
 /*!
- * © 2019 Atypon Systems LLC
+ * © 2024 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.
@@ -14,108 +14,3 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = 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 | table_header)*',
-    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 }],
-    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];
-    },
-};
-exports.tableHeader = Object.assign(Object.assign({}, exports.tableCell), { tableRole: 'header_cell', parseDOM: [{ tag: 'th', getAttrs: getCellAttrs }] });

package/dist/cjs/transformer/decode.js

@@ -557,18 +557,16 @@ 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 tableColGroup = this.createTableColGroup(model);
                 const tableElementFooter = this.createTableElementFooter(model);
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
@@ -576,6 +574,9 @@ class Decoder {
                 const content = tableElementFooter
                     ? [table, tableElementFooter, figcaption]
                     : [table, figcaption];
+                if (tableColGroup) {
+                    content.unshift(tableColGroup);
+                }
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -789,6 +790,15 @@ class Decoder {
         }
         return table;
     }
+    createTableColGroup(model) {
+        const tableId = model.containedObjectID;
+        const tableModel = this.getModel(tableId);
+        if (tableModel) {
+            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

@@ -99,9 +99,28 @@ const buildTableSection = (tagName, inputRows, parent) => {
     }
     return section;
 };
+function buildTableColGroup(cols) {
+    if (cols.length === 0) {
+        return undefined;
+    }
+    const colgroup = document.createElement('colgroup');
+    for (const inputCol of cols) {
+        const col = document.createElement('col');
+        for (const attribute of inputCol.attributes) {
+            col.setAttribute(attribute.name, attribute.value);
+        }
+        colgroup.appendChild(inputCol);
+    }
+    return colgroup;
+}
 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')));
+    if (colgroup) {
+        output.appendChild(colgroup);
+    }
     output.setAttribute('id', parent.attrs.id);
     output.classList.add('MPElement');
     if (parent.attrs.tableStyle) {

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

@@ -524,10 +524,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'tbody',
-        skip: true,
-    },
     {
         tag: 'tfoot',
         skip: true,
@@ -567,7 +563,7 @@ const nodes = [
             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') });
         },
     },
     {
@@ -580,10 +576,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'colgroup',
-        node: 'table_colgroup',
-    },
     {
         tag: 'xref[ref-type="bibr"]',
         node: 'citation',

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

@@ -238,6 +238,7 @@ export const jatsBodyTransformations = {
     fixTables(body, createElement) {
         const tables = body.querySelectorAll('table-wrap > table');
         tables.forEach((table) => {
+            var _a;
             const colgroup = table.querySelector('colgroup');
             const cols = table.querySelectorAll('col');
             if (!colgroup && table.firstChild && cols.length > 0) {
@@ -245,20 +246,19 @@ export const jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                table.insertBefore(colgroup, table.firstChild);
+                (_a = table.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(colgroup, table);
+            }
+            const rows = table.querySelectorAll('tr');
+            for (const row of rows) {
+                table.appendChild(row);
+            }
+            const thead = table.querySelector('thead');
+            if (thead) {
+                table.removeChild(thead);
             }
             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);
-                }
+                table.removeChild(tbody);
             }
         });
     },

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

@@ -69,7 +69,8 @@ export const parseJATSBody = (doc, body, references) => {
     }
     const replacements = new Map(references === null || references === void 0 ? void 0 : references.IDs);
     updateDocumentIDs(node, replacements);
-    return encode(node).values();
+    const models = encode(node);
+    return models.values();
 };
 const createBibliographyModels = (references) => {
     const models = [];

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

@@ -607,7 +607,7 @@ export class JATSExporter {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
                 table_header: (node) => [
-                    node.attrs.celltype,
+                    '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,
                 ],
@@ -871,7 +871,7 @@ export class JATSExporter {
                     return element;
                 },
                 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,
                 ],
@@ -952,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 = 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) {
@@ -972,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 } 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, tableHeader, 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';

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

@@ -13,42 +13,83 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const table = {
-    content: 'table_row+',
-    tableRole: 'table',
-    isolating: true,
-    group: 'block',
-    selectable: false,
-    attrs: {
-        id: { default: '' },
-        headerRows: { default: 1 },
-        footerRows: { default: 1 },
-        dataTracked: { default: null },
-        comments: { default: null },
-    },
-    parseDOM: [
-        {
-            tag: 'table',
-            getAttrs: (p) => {
-                const dom = p;
-                return {
-                    id: dom.getAttribute('id'),
-                    headerRows: dom.dataset && dom.dataset['header-rows'],
-                    footerRows: dom.dataset && dom.dataset['footer-rows'],
-                };
+import { tableNodes as createTableNodes, } from 'prosemirror-tables';
+import { getTableCellStyles, serializeTableCellStyles, } from '../../lib/table-cell-styles';
+const tableOptions = {
+    tableGroup: 'block',
+    cellContent: 'inline*',
+    cellAttributes: {
+        placeholder: {
+            default: 'Data',
+            getFromDOM(dom) {
+                return dom.getAttribute('data-placeholder-text') || '';
+            },
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['data-placeholder-text'] = value;
+                }
+            },
+        },
+        styles: {
+            default: {},
+            getFromDOM(dom) {
+                return getTableCellStyles(dom.style);
+            },
+            setDOMAttr(value, attrs) {
+                const styleString = serializeTableCellStyles(value);
+                if (styleString) {
+                    attrs['style'] = 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;
+                }
             },
         },
-    ],
-    toDOM: (node) => {
-        const tableNode = node;
-        return [
-            'table',
-            {
-                id: tableNode.attrs.id,
-                'data-header-rows': String(node.attrs.headerRows),
-                'data-footer-rows': String(node.attrs.footerRows),
-            },
-            0,
-        ];
     },
 };
+export const tableNodes = createTableNodes(tableOptions);
+export const table = Object.assign(Object.assign({}, tableNodes.table), { attrs: Object.assign(Object.assign({}, tableNodes.table.attrs), { id: { default: '' } }) });
+export const tableCell = tableNodes.table_cell;
+export const tableRow = tableNodes.table_row;
+export const tableHeader = tableNodes.table_header;

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/schema/nodes/table_row.js

@@ -1,5 +1,6 @@
+"use strict";
 /*!
- * © 2019 Atypon Systems LLC
+ * © 2024 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.
@@ -13,106 +14,3 @@
  * 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 | table_header)*',
-    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 }],
-    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];
-    },
-};
-export const tableHeader = Object.assign(Object.assign({}, tableCell), { tableRole: 'header_cell', parseDOM: [{ tag: 'th', getAttrs: getCellAttrs }] });

package/dist/es/transformer/decode.js

@@ -548,18 +548,16 @@ 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 tableColGroup = this.createTableColGroup(model);
                 const tableElementFooter = this.createTableElementFooter(model);
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
@@ -567,6 +565,9 @@ export class Decoder {
                 const content = tableElementFooter
                     ? [table, tableElementFooter, figcaption]
                     : [table, figcaption];
+                if (tableColGroup) {
+                    content.unshift(tableColGroup);
+                }
                 if (model.listingID) {
                     const listing = this.createListing(model.listingID);
                     content.push(listing);
@@ -780,6 +781,15 @@ export class Decoder {
         }
         return table;
     }
+    createTableColGroup(model) {
+        const tableId = model.containedObjectID;
+        const tableModel = this.getModel(tableId);
+        if (tableModel) {
+            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

@@ -91,9 +91,28 @@ const buildTableSection = (tagName, inputRows, parent) => {
     }
     return section;
 };
+function buildTableColGroup(cols) {
+    if (cols.length === 0) {
+        return undefined;
+    }
+    const colgroup = document.createElement('colgroup');
+    for (const inputCol of cols) {
+        const col = document.createElement('col');
+        for (const attribute of inputCol.attributes) {
+            col.setAttribute(attribute.name, attribute.value);
+        }
+        colgroup.appendChild(inputCol);
+    }
+    return colgroup;
+}
 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')));
+    if (colgroup) {
+        output.appendChild(colgroup);
+    }
     output.setAttribute('id', parent.attrs.id);
     output.classList.add('MPElement');
     if (parent.attrs.tableStyle) {

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,14 +13,32 @@
  * 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 {
+import { TableNodes } from 'prosemirror-tables';
+export declare const tableNodes: TableNodes;
+export declare const table: {
     attrs: {
-        id: string;
-        headerRows: number;
-        footerRows: number;
-        comments?: CommentNode[];
+        id: {
+            default: string;
+        };
     };
-}
-export declare const table: TableNodeSpec;
+    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: import("prosemirror-model").NodeSpec;
+export declare const tableRow: import("prosemirror-model").NodeSpec;
+export declare const tableHeader: import("prosemirror-model").NodeSpec;

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

@@ -1,5 +1,5 @@
 /*!
- * © 2019 Atypon Systems LLC
+ * © 2024 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.
@@ -13,30 +13,3 @@
  * 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;
-export declare const tableHeader: TableNodeSpec;

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

@@ -43,6 +43,7 @@ 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-4",
+  "version": "2.1.1-LEAN-3336-7",
   "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",