@manuscripts/transform 2.1.1-LEAN-3336-12 → 2.1.1-LEAN-3336-14

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

@@ -241,7 +241,6 @@ 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) {
@@ -249,19 +248,20 @@ exports.jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                (_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);
+                table.insertBefore(colgroup, table.firstChild);
             }
             const tbody = table.querySelector('tbody');
             if (tbody) {
-                table.removeChild(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);
+                }
             }
         });
     },

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = exports.tableNodes = exports.createTableNodes = void 0;
+exports.tableHeader = exports.tableCell = exports.tableRow = exports.table = exports.tableNodes = void 0;
 const table_cell_styles_1 = require("../../lib/table-cell-styles");
 function getCellAttrs(dom, extraAttrs) {
     if (typeof dom === 'string') {
@@ -77,6 +77,13 @@ function createTableNodes(options) {
             content: 'table_row+',
             tableRole: 'table',
             isolating: true,
+            attrs: {
+                id: { default: '' },
+                dataTracked: { default: null },
+                comments: { default: null },
+                headerRows: { default: 1 },
+                footerRows: { default: 1 },
+            },
             group: options.tableGroup,
             parseDOM: [
                 {
@@ -137,7 +144,6 @@ function createTableNodes(options) {
         },
     };
 }
-exports.createTableNodes = createTableNodes;
 const tableOptions = {
     tableGroup: 'block',
     cellContent: 'inline*',
@@ -165,14 +171,6 @@ const tableOptions = {
                 }
             },
         },
-        class: {
-            default: null,
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['class'] = value;
-                }
-            },
-        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -220,7 +218,7 @@ const 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 }, headerRows: { default: 1 }, footerRows: { default: 1 } }) });
+exports.table = exports.tableNodes.table;
 exports.tableRow = exports.tableNodes.table_row;
 exports.tableCell = exports.tableNodes.table_cell;
 exports.tableHeader = exports.tableNodes.table_header;

package/dist/cjs/transformer/decode.js

@@ -574,12 +574,14 @@ class Decoder {
                 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);

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

@@ -238,7 +238,6 @@ 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) {
@@ -246,19 +245,20 @@ export const jatsBodyTransformations = {
                 for (const col of cols) {
                     colgroup.appendChild(col);
                 }
-                (_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);
+                table.insertBefore(colgroup, table.firstChild);
             }
             const tbody = table.querySelector('tbody');
             if (tbody) {
-                table.removeChild(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);
+                }
             }
         });
     },

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

@@ -59,7 +59,7 @@ function setCellAttrs(node, extraAttrs) {
     }
     return attrs;
 }
-export function createTableNodes(options) {
+function createTableNodes(options) {
     const extraAttrs = options.cellAttributes || {};
     const cellAttrs = {
         colspan: { default: 1 },
@@ -74,6 +74,13 @@ export function createTableNodes(options) {
             content: 'table_row+',
             tableRole: 'table',
             isolating: true,
+            attrs: {
+                id: { default: '' },
+                dataTracked: { default: null },
+                comments: { default: null },
+                headerRows: { default: 1 },
+                footerRows: { default: 1 },
+            },
             group: options.tableGroup,
             parseDOM: [
                 {
@@ -161,14 +168,6 @@ const tableOptions = {
                 }
             },
         },
-        class: {
-            default: null,
-            setDOMAttr(value, attrs) {
-                if (value) {
-                    attrs['class'] = value;
-                }
-            },
-        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -216,7 +215,7 @@ 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 }, headerRows: { default: 1 }, footerRows: { default: 1 } }) });
+export const table = tableNodes.table;
 export const tableRow = tableNodes.table_row;
 export const tableCell = tableNodes.table_cell;
 export const tableHeader = tableNodes.table_header;

package/dist/es/transformer/decode.js

@@ -565,12 +565,14 @@ export class Decoder {
                 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);

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

@@ -13,46 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Node } from 'prosemirror-model';
-import { TableNodes, TableNodesOptions } from 'prosemirror-tables';
-export declare function createTableNodes(options: TableNodesOptions): TableNodes;
+import { TableNodes } from 'prosemirror-tables';
 export declare const tableNodes: TableNodes;
-export declare const table: {
-    attrs: {
-        id: {
-            default: string;
-        };
-        dataTracked: {
-            default: null;
-        };
-        comments: {
-            default: null;
-        };
-        headerRows: {
-            default: number;
-        };
-        footerRows: {
-            default: number;
-        };
-    };
-    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: Node) => import("prosemirror-model").DOMOutputSpec) | undefined;
-    parseDOM?: readonly import("prosemirror-model").ParseRule[] | undefined;
-    toDebugString?: ((node: Node) => string) | undefined;
-    leafText?: ((node: Node) => string) | undefined;
-};
+export declare const table: 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-12",
+  "version": "2.1.1-LEAN-3336-14",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",