@manuscripts/transform 2.1.1-LEAN-3336-8 → 2.1.1-LEAN-3336-10

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

@@ -967,7 +967,7 @@ class JATSExporter {
                     return;
                 }
                 const table = this.serializeNode(tableNode);
-                const tbodyElement = document.createElement('tbody');
+                const tbodyElement = this.document.createElement('tbody');
                 while (table.firstChild) {
                     const child = table.firstChild;
                     table.removeChild(child);

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

@@ -15,9 +15,109 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = exports.tableRow = exports.tableCell = exports.table = exports.tableNodes = void 0;
-const prosemirror_tables_1 = require("prosemirror-tables");
+exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = exports.tableNodes = exports.createTableNodes = void 0;
 const table_cell_styles_1 = require("../../lib/table-cell-styles");
+function getCellAttrs(dom, extraAttrs) {
+    if (typeof dom === 'string') {
+        return {};
+    }
+    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 result = {
+        colspan,
+        rowspan: Number(dom.getAttribute('rowspan') || 1),
+        colwidth: widths && widths.length == colspan ? widths : null,
+    };
+    for (const prop in extraAttrs) {
+        const getter = extraAttrs[prop].getFromDOM;
+        const value = getter && getter(dom);
+        if (value != null) {
+            result[prop] = value;
+        }
+    }
+    return result;
+}
+function setCellAttrs(node, extraAttrs) {
+    const attrs = {};
+    if (node.attrs.colspan != 1) {
+        attrs.colspan = node.attrs.colspan;
+    }
+    if (node.attrs.rowspan != 1) {
+        attrs.rowspan = node.attrs.rowspan;
+    }
+    if (node.attrs.colwidth) {
+        attrs['data-colwidth'] = node.attrs.colwidth.join(',');
+    }
+    if (node.textContent) {
+        attrs.class = 'palceholder';
+    }
+    for (const prop in extraAttrs) {
+        const setter = extraAttrs[prop].setDOMAttr;
+        if (setter) {
+            setter(node.attrs[prop], attrs);
+        }
+    }
+    return attrs;
+}
+function createTableNodes(options) {
+    const extraAttrs = options.cellAttributes || {};
+    const cellAttrs = {
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+    };
+    for (const prop in extraAttrs) {
+        cellAttrs[prop] = { default: extraAttrs[prop].default };
+    }
+    return {
+        table: {
+            content: 'table_row+',
+            tableRole: 'table',
+            isolating: true,
+            group: options.tableGroup,
+            parseDOM: [{ tag: 'table' }],
+            toDOM() {
+                return ['table', ['tbody', 0]];
+            },
+        },
+        table_row: {
+            content: '(table_cell | table_header)*',
+            tableRole: 'row',
+            parseDOM: [{ tag: 'tr' }],
+            toDOM() {
+                return ['tr', 0];
+            },
+        },
+        table_cell: {
+            content: options.cellContent,
+            attrs: cellAttrs,
+            tableRole: 'cell',
+            isolating: true,
+            parseDOM: [
+                { tag: 'td', getAttrs: (dom) => getCellAttrs(dom, extraAttrs) },
+            ],
+            toDOM(node) {
+                return ['td', setCellAttrs(node, extraAttrs), 0];
+            },
+        },
+        table_header: {
+            content: options.cellContent,
+            attrs: cellAttrs,
+            tableRole: 'header_cell',
+            isolating: true,
+            parseDOM: [
+                { tag: 'th', getAttrs: (dom) => getCellAttrs(dom, extraAttrs) },
+            ],
+            toDOM(node) {
+                return ['th', setCellAttrs(node, extraAttrs), 0];
+            },
+        },
+    };
+}
+exports.createTableNodes = createTableNodes;
 const tableOptions = {
     tableGroup: 'block',
     cellContent: 'inline*',
@@ -45,6 +145,14 @@ const tableOptions = {
                 }
             },
         },
+        class: {
+            default: null,
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['class'] = value;
+                }
+            },
+        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -91,8 +199,8 @@ const tableOptions = {
         },
     },
 };
-exports.tableNodes = (0, prosemirror_tables_1.tableNodes)(tableOptions);
+exports.tableNodes = createTableNodes(tableOptions);
 exports.table = Object.assign(Object.assign({}, exports.tableNodes.table), { attrs: Object.assign(Object.assign({}, exports.tableNodes.table.attrs), { id: { default: '' }, dataTracked: { default: null }, comments: { default: null } }) });
-exports.tableCell = exports.tableNodes.table_cell;
 exports.tableRow = exports.tableNodes.table_row;
+exports.tableCell = exports.tableNodes.table_cell;
 exports.tableHeader = exports.tableNodes.table_header;

package/dist/cjs/transformer/decode.js

@@ -796,11 +796,12 @@ class Decoder {
     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(),
-            });
+        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;

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

@@ -959,7 +959,7 @@ export class JATSExporter {
                     return;
                 }
                 const table = this.serializeNode(tableNode);
-                const tbodyElement = document.createElement('tbody');
+                const tbodyElement = this.document.createElement('tbody');
                 while (table.firstChild) {
                     const child = table.firstChild;
                     table.removeChild(child);

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

@@ -13,8 +13,107 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { tableNodes as createTableNodes, } from 'prosemirror-tables';
 import { getTableCellStyles, serializeTableCellStyles, } from '../../lib/table-cell-styles';
+function getCellAttrs(dom, extraAttrs) {
+    if (typeof dom === 'string') {
+        return {};
+    }
+    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 result = {
+        colspan,
+        rowspan: Number(dom.getAttribute('rowspan') || 1),
+        colwidth: widths && widths.length == colspan ? widths : null,
+    };
+    for (const prop in extraAttrs) {
+        const getter = extraAttrs[prop].getFromDOM;
+        const value = getter && getter(dom);
+        if (value != null) {
+            result[prop] = value;
+        }
+    }
+    return result;
+}
+function setCellAttrs(node, extraAttrs) {
+    const attrs = {};
+    if (node.attrs.colspan != 1) {
+        attrs.colspan = node.attrs.colspan;
+    }
+    if (node.attrs.rowspan != 1) {
+        attrs.rowspan = node.attrs.rowspan;
+    }
+    if (node.attrs.colwidth) {
+        attrs['data-colwidth'] = node.attrs.colwidth.join(',');
+    }
+    if (node.textContent) {
+        attrs.class = 'palceholder';
+    }
+    for (const prop in extraAttrs) {
+        const setter = extraAttrs[prop].setDOMAttr;
+        if (setter) {
+            setter(node.attrs[prop], attrs);
+        }
+    }
+    return attrs;
+}
+export function createTableNodes(options) {
+    const extraAttrs = options.cellAttributes || {};
+    const cellAttrs = {
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+    };
+    for (const prop in extraAttrs) {
+        cellAttrs[prop] = { default: extraAttrs[prop].default };
+    }
+    return {
+        table: {
+            content: 'table_row+',
+            tableRole: 'table',
+            isolating: true,
+            group: options.tableGroup,
+            parseDOM: [{ tag: 'table' }],
+            toDOM() {
+                return ['table', ['tbody', 0]];
+            },
+        },
+        table_row: {
+            content: '(table_cell | table_header)*',
+            tableRole: 'row',
+            parseDOM: [{ tag: 'tr' }],
+            toDOM() {
+                return ['tr', 0];
+            },
+        },
+        table_cell: {
+            content: options.cellContent,
+            attrs: cellAttrs,
+            tableRole: 'cell',
+            isolating: true,
+            parseDOM: [
+                { tag: 'td', getAttrs: (dom) => getCellAttrs(dom, extraAttrs) },
+            ],
+            toDOM(node) {
+                return ['td', setCellAttrs(node, extraAttrs), 0];
+            },
+        },
+        table_header: {
+            content: options.cellContent,
+            attrs: cellAttrs,
+            tableRole: 'header_cell',
+            isolating: true,
+            parseDOM: [
+                { tag: 'th', getAttrs: (dom) => getCellAttrs(dom, extraAttrs) },
+            ],
+            toDOM(node) {
+                return ['th', setCellAttrs(node, extraAttrs), 0];
+            },
+        },
+    };
+}
 const tableOptions = {
     tableGroup: 'block',
     cellContent: 'inline*',
@@ -42,6 +141,14 @@ const tableOptions = {
                 }
             },
         },
+        class: {
+            default: null,
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['class'] = value;
+                }
+            },
+        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -90,6 +197,6 @@ const tableOptions = {
 };
 export const tableNodes = createTableNodes(tableOptions);
 export const table = Object.assign(Object.assign({}, tableNodes.table), { attrs: Object.assign(Object.assign({}, tableNodes.table.attrs), { id: { default: '' }, dataTracked: { default: null }, comments: { default: null } }) });
-export const tableCell = tableNodes.table_cell;
 export const tableRow = tableNodes.table_row;
+export const tableCell = tableNodes.table_cell;
 export const tableHeader = tableNodes.table_header;

package/dist/es/transformer/decode.js

@@ -787,11 +787,12 @@ export class Decoder {
     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(),
-            });
+        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;

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

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TableNodes } from 'prosemirror-tables';
+import { Node } from 'prosemirror-model';
+import { TableNodes, TableNodesOptions } from 'prosemirror-tables';
+export declare function createTableNodes(options: TableNodesOptions): TableNodes;
 export declare const tableNodes: TableNodes;
 export declare const table: {
     attrs: {
@@ -40,11 +42,11 @@ export declare const table: {
     definingForContent?: boolean | undefined;
     defining?: boolean | undefined;
     isolating?: boolean | undefined;
-    toDOM?: ((node: import("prosemirror-model").Node) => import("prosemirror-model").DOMOutputSpec) | undefined;
+    toDOM?: ((node: 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;
+    toDebugString?: ((node: Node) => string) | undefined;
+    leafText?: ((node: Node) => string) | undefined;
 };
-export declare const tableCell: import("prosemirror-model").NodeSpec;
 export declare const tableRow: import("prosemirror-model").NodeSpec;
+export declare const tableCell: import("prosemirror-model").NodeSpec;
 export declare const tableHeader: import("prosemirror-model").NodeSpec;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.1-LEAN-3336-8",
+  "version": "2.1.1-LEAN-3336-10",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",