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

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

@@ -582,6 +582,10 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'colgroup',
+        node: 'table_colgroup',
+    },
     {
         tag: 'xref[ref-type="bibr"]',
         node: 'citation',

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

@@ -73,8 +73,7 @@ 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);
-    const models = (0, transformer_1.encode)(node);
-    return models.values();
+    return (0, transformer_1.encode)(node).values();
 };
 exports.parseJATSBody = parseJATSBody;
 const createBibliographyModels = (references) => {

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,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableHeader = exports.tableRow = exports.tableCell = exports.table = exports.tableNodes = void 0;
+exports.tableCell = exports.tableHeader = exports.tableRow = 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 = {
@@ -45,6 +45,14 @@ const tableOptions = {
                 }
             },
         },
+        class: {
+            default: null,
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['class'] = value;
+                }
+            },
+        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -92,7 +100,27 @@ const tableOptions = {
     },
 };
 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.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 } }) });
+const tableCell = exports.tableNodes.table_cell;
+exports.tableCell = tableCell;
+tableCell.toDOM = (node) => {
+    if (!node.textContent) {
+        node.attrs.class = 'placeholder';
+    }
+    if (exports.tableNodes.table_cell.toDOM) {
+        return exports.tableNodes.table_cell.toDOM(node);
+    }
+    return ['td'];
+};
+const tableHeader = exports.tableNodes.table_cell;
+exports.tableHeader = tableHeader;
+tableHeader.toDOM = (node) => {
+    if (!node.textContent) {
+        node.attrs.class = 'placeholder';
+    }
+    if (exports.tableNodes.table_header.toDOM) {
+        return exports.tableNodes.table_header.toDOM(node);
+    }
+    return ['th'];
+};
 exports.tableRow = exports.tableNodes.table_row;
-exports.tableHeader = exports.tableNodes.table_header;

package/dist/cjs/transformer/decode.js

@@ -557,9 +557,12 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.Table]: (data) => {
                 const model = data;
-                return this.parseContents(model.contents, undefined, [], {
+                const comments = this.createCommentNodes(model);
+                comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                return this.parseContents(model.contents, undefined, this.getComments(model), {
                     topNode: schema_1.schema.nodes.table.create({
                         id: model._id,
+                        comments: comments.map((c) => c.attrs.id),
                     }),
                 });
             },
@@ -793,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/importer/jats-body-dom-parser.js

@@ -576,6 +576,10 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'colgroup',
+        node: 'table_colgroup',
+    },
     {
         tag: 'xref[ref-type="bibr"]',
         node: 'citation',

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

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

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

@@ -42,6 +42,14 @@ const tableOptions = {
                 }
             },
         },
+        class: {
+            default: null,
+            setDOMAttr(value, attrs) {
+                if (value) {
+                    attrs['class'] = value;
+                }
+            },
+        },
         valign: {
             default: null,
             getFromDOM(dom) {
@@ -89,7 +97,26 @@ 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: '' } }) });
-export const tableCell = tableNodes.table_cell;
+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 } }) });
+const tableCell = tableNodes.table_cell;
+tableCell.toDOM = (node) => {
+    if (!node.textContent) {
+        node.attrs.class = 'placeholder';
+    }
+    if (tableNodes.table_cell.toDOM) {
+        return tableNodes.table_cell.toDOM(node);
+    }
+    return ['td'];
+};
+const tableHeader = tableNodes.table_cell;
+tableHeader.toDOM = (node) => {
+    if (!node.textContent) {
+        node.attrs.class = 'placeholder';
+    }
+    if (tableNodes.table_header.toDOM) {
+        return tableNodes.table_header.toDOM(node);
+    }
+    return ['th'];
+};
 export const tableRow = tableNodes.table_row;
-export const tableHeader = tableNodes.table_header;
+export { tableHeader, tableCell };

package/dist/es/transformer/decode.js

@@ -548,9 +548,12 @@ export class Decoder {
             },
             [ObjectTypes.Table]: (data) => {
                 const model = data;
-                return this.parseContents(model.contents, undefined, [], {
+                const comments = this.createCommentNodes(model);
+                comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                return this.parseContents(model.contents, undefined, this.getComments(model), {
                     topNode: schema.nodes.table.create({
                         id: model._id,
+                        comments: comments.map((c) => c.attrs.id),
                     }),
                 });
             },
@@ -784,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

@@ -20,6 +20,12 @@ export declare const table: {
         id: {
             default: string;
         };
+        dataTracked: {
+            default: null;
+        };
+        comments: {
+            default: null;
+        };
     };
     content?: string | undefined;
     marks?: string | undefined;
@@ -39,6 +45,7 @@ export declare const table: {
     toDebugString?: ((node: import("prosemirror-model").Node) => string) | undefined;
     leafText?: ((node: import("prosemirror-model").Node) => string) | undefined;
 };
-export declare const tableCell: import("prosemirror-model").NodeSpec;
+declare const tableCell: import("prosemirror-model").NodeSpec;
+declare const tableHeader: import("prosemirror-model").NodeSpec;
 export declare const tableRow: import("prosemirror-model").NodeSpec;
-export declare const tableHeader: import("prosemirror-model").NodeSpec;
+export { tableHeader, tableCell };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.1-LEAN-3336-7",
+  "version": "2.1.1-LEAN-3336-9",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -35,7 +35,7 @@
     "jszip": "^3.10.1",
     "mathjax-full": "^3.2.2",
     "mime": "^3.0.0",
-    "prosemirror-model": "^1.18.3",
+    "prosemirror-model": "^1.8.1",
     "prosemirror-tables": "^1.3.5",
     "uuid": "^9.0.0",
     "w3c-xmlserializer": "^4.0.0"

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

@@ -1,16 +0,0 @@
-"use strict";
-/*!
- * © 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.
- * 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.
- */

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

@@ -1,16 +0,0 @@
-"use strict";
-/*!
- * © 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.
- * 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.
- */

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

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