@manuscripts/transform 2.3.2 → 2.3.3-LEAN-3519-0

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

@@ -315,6 +315,24 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'general-table-footnote',
+        node: 'general_table_footnote',
+        context: 'table_element_footer/',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+            };
+        },
+        getContent: (node) => {
+            const generalTableFootnote = schema_1.schema.nodes.paragraph.create();
+            const content = exports.jatsBodyDOMParser.parse(node, {
+                topNode: generalTableFootnote,
+            });
+            return prosemirror_model_1.Fragment.from([content]);
+        },
+    },
     {
         tag: 'fn',
         node: 'footnote',

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

@@ -242,6 +242,18 @@ exports.jatsBodyTransformations = {
                 }
                 tableWrap.insertBefore(colgroup, table.nextSibling);
             }
+            const tableFootWrap = tableWrap.querySelector('table-wrap-foot');
+            if (tableFootWrap) {
+                const paragraphs = tableFootWrap.querySelectorAll(':scope > p');
+                if (paragraphs.length) {
+                    const generalTableFootnote = createElement('general-table-footnote');
+                    for (const paragraph of paragraphs) {
+                        removeNodeFromParent(paragraph);
+                        generalTableFootnote.append(paragraph);
+                    }
+                    tableFootWrap.prepend(generalTableFootnote);
+                }
+            }
         });
     },
     orderTableFootnote(doc, body) {

package/dist/cjs/jats/importer/jats-parser-utils.js

@@ -36,6 +36,10 @@ const updateNodeID = (node, replacements, warnings) => {
         node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${(0, uuid_1.v4)()}` });
         return;
     }
+    if (node.type === schema_1.schema.nodes.general_table_footnote) {
+        node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `GeneralTableFootnote:${(0, uuid_1.v4)()}` });
+        return;
+    }
     if (!('id' in node.attrs)) {
         return;
     }

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

@@ -676,6 +676,9 @@ class JATSExporter {
                 equation: (node) => {
                     return this.createEquation(node);
                 },
+                general_table_footnote: (node) => {
+                    return this.serializeNode(node.child(0));
+                },
                 inline_equation: (node) => {
                     const eqElement = this.document.createElement('inline-formula');
                     const equation = this.createEquation(node, true);

package/dist/cjs/schema/index.js

@@ -61,6 +61,7 @@ const figure_element_1 = require("./nodes/figure_element");
 const footnote_1 = require("./nodes/footnote");
 const footnotes_element_1 = require("./nodes/footnotes_element");
 const footnotes_section_1 = require("./nodes/footnotes_section");
+const general_table_footnote_1 = require("./nodes/general_table_footnote");
 const graphical_abstract_section_1 = require("./nodes/graphical_abstract_section");
 const hard_break_1 = require("./nodes/hard_break");
 const highlight_marker_1 = require("./nodes/highlight_marker");
@@ -112,6 +113,7 @@ __exportStar(require("./nodes/equation_element"), exports);
 __exportStar(require("./nodes/figcaption"), exports);
 __exportStar(require("./nodes/figure"), exports);
 __exportStar(require("./nodes/figure_element"), exports);
+__exportStar(require("./nodes/general_table_footnote"), exports);
 __exportStar(require("./nodes/footnote"), exports);
 __exportStar(require("./nodes/footnotes_element"), exports);
 __exportStar(require("./nodes/footnotes_section"), exports);
@@ -187,6 +189,7 @@ exports.schema = new prosemirror_model_1.Schema({
         footnote: footnote_1.footnote,
         footnotes_element: footnotes_element_1.footnotesElement,
         footnotes_section: footnotes_section_1.footnotesSection,
+        general_table_footnote: general_table_footnote_1.generalTableFootnote,
         graphical_abstract_section: graphical_abstract_section_1.graphicalAbstractSection,
         hard_break: hard_break_1.hardBreak,
         highlight_marker: highlight_marker_1.highlightMarker,

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

@@ -0,0 +1,27 @@
+"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.generalTableFootnote = void 0;
+exports.generalTableFootnote = {
+    content: 'paragraph*',
+    attrs: {
+        id: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block',
+    toDOM: () => ['general-table-footnote', 0],
+};

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

@@ -21,7 +21,7 @@ exports.tableElementFooter = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(paragraph | footnotes_element)*',
+    content: 'general_table_footnote? footnotes_element?',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

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

@@ -17,8 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.title = void 0;
 exports.title = {
-    content: 'text*',
-    marks: 'italic smallcaps subscript superscript tracked_insert tracked_delete',
+    content: '(text | highlight_marker)*',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

package/dist/cjs/transformer/decode.js

@@ -169,7 +169,9 @@ class Decoder {
         this.creators = {
             [json_schema_1.ObjectTypes.Titles]: (data) => {
                 const model = data;
-                return this.parseContents(model.title, 'div', undefined, {
+                const comments = this.createCommentNodes(model);
+                comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                return this.parseContents(model.title, 'div', this.getComments(model), {
                     topNode: schema_1.schema.nodes.title.create({
                         id: model._id,
                     }),
@@ -490,10 +492,32 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.TableElementFooter]: (data) => {
                 const model = data;
-                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
+                const contents = [];
+                const generalTableFootnotes = [];
+                const footnotesElements = [];
+                for (const containedObjectID of model.containedObjectIDs) {
+                    const model = this.modelMap.get(containedObjectID);
+                    if (model.objectType === json_schema_1.ObjectTypes.ParagraphElement) {
+                        const paragraph = this.decode(model);
+                        if (paragraph) {
+                            generalTableFootnotes.push(paragraph);
+                        }
+                    }
+                    else {
+                        footnotesElements.push(this.decode(model));
+                    }
+                }
+                if (generalTableFootnotes && generalTableFootnotes.length) {
+                    contents.push(schema_1.schema.nodes.general_table_footnote.create({}, [
+                        ...generalTableFootnotes,
+                    ]));
+                }
+                if (footnotesElements && footnotesElements.length) {
+                    contents.push(...footnotesElements);
+                }
                 return schema_1.schema.nodes.table_element_footer.create({
                     id: model._id,
-                }, content);
+                }, contents);
             },
             [json_schema_1.ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;

package/dist/cjs/transformer/encode.js

@@ -210,6 +210,18 @@ const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
 };
+const tableElementFooterContainedIDs = (node) => {
+    const containedGeneralTableFootnoteIDs = containedObjectIDs(node, [
+        schema_1.schema.nodes.footnotes_element,
+    ]);
+    for (let i = 0; i < node.childCount; i++) {
+        const childNode = node.child(i);
+        if (childNode.type === schema_1.schema.nodes.general_table_footnote) {
+            containedGeneralTableFootnoteIDs.push(...containedObjectIDs(childNode));
+        }
+    }
+    return containedGeneralTableFootnoteIDs;
+};
 const containedObjectIDs = (node, nodeTypes) => {
     const ids = [];
     for (let i = 0; i < node.childCount; i++) {
@@ -382,7 +394,7 @@ const encoders = {
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     table_element_footer: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
+        containedObjectIDs: tableElementFooterContainedIDs(node),
     }),
     author_notes: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
@@ -558,6 +570,7 @@ const containerTypes = [
     schema_1.schema.nodes.abstracts,
     schema_1.schema.nodes.body,
     schema_1.schema.nodes.backmatter,
+    schema_1.schema.nodes.general_table_footnote,
 ];
 const placeholderTypes = [
     schema_1.schema.nodes.placeholder,

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

@@ -309,6 +309,24 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'general-table-footnote',
+        node: 'general_table_footnote',
+        context: 'table_element_footer/',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+            };
+        },
+        getContent: (node) => {
+            const generalTableFootnote = schema.nodes.paragraph.create();
+            const content = jatsBodyDOMParser.parse(node, {
+                topNode: generalTableFootnote,
+            });
+            return Fragment.from([content]);
+        },
+    },
     {
         tag: 'fn',
         node: 'footnote',

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

@@ -239,6 +239,18 @@ export const jatsBodyTransformations = {
                 }
                 tableWrap.insertBefore(colgroup, table.nextSibling);
             }
+            const tableFootWrap = tableWrap.querySelector('table-wrap-foot');
+            if (tableFootWrap) {
+                const paragraphs = tableFootWrap.querySelectorAll(':scope > p');
+                if (paragraphs.length) {
+                    const generalTableFootnote = createElement('general-table-footnote');
+                    for (const paragraph of paragraphs) {
+                        removeNodeFromParent(paragraph);
+                        generalTableFootnote.append(paragraph);
+                    }
+                    tableFootWrap.prepend(generalTableFootnote);
+                }
+            }
         });
     },
     orderTableFootnote(doc, body) {

package/dist/es/jats/importer/jats-parser-utils.js

@@ -32,6 +32,10 @@ const updateNodeID = (node, replacements, warnings) => {
         node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${uuidv4()}` });
         return;
     }
+    if (node.type === schema.nodes.general_table_footnote) {
+        node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `GeneralTableFootnote:${uuidv4()}` });
+        return;
+    }
     if (!('id' in node.attrs)) {
         return;
     }

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

@@ -668,6 +668,9 @@ export class JATSExporter {
                 equation: (node) => {
                     return this.createEquation(node);
                 },
+                general_table_footnote: (node) => {
+                    return this.serializeNode(node.child(0));
+                },
                 inline_equation: (node) => {
                     const eqElement = this.document.createElement('inline-formula');
                     const equation = this.createEquation(node, true);

package/dist/es/schema/index.js

@@ -44,6 +44,7 @@ import { figureElement } from './nodes/figure_element';
 import { footnote } from './nodes/footnote';
 import { footnotesElement } from './nodes/footnotes_element';
 import { footnotesSection } from './nodes/footnotes_section';
+import { generalTableFootnote } from './nodes/general_table_footnote';
 import { graphicalAbstractSection } from './nodes/graphical_abstract_section';
 import { hardBreak } from './nodes/hard_break';
 import { highlightMarker } from './nodes/highlight_marker';
@@ -95,6 +96,7 @@ export * from './nodes/equation_element';
 export * from './nodes/figcaption';
 export * from './nodes/figure';
 export * from './nodes/figure_element';
+export * from './nodes/general_table_footnote';
 export * from './nodes/footnote';
 export * from './nodes/footnotes_element';
 export * from './nodes/footnotes_section';
@@ -170,6 +172,7 @@ export const schema = new Schema({
         footnote,
         footnotes_element: footnotesElement,
         footnotes_section: footnotesSection,
+        general_table_footnote: generalTableFootnote,
         graphical_abstract_section: graphicalAbstractSection,
         hard_break: hardBreak,
         highlight_marker: highlightMarker,

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

@@ -0,0 +1,24 @@
+/*!
+ * © 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.
+ */
+export const generalTableFootnote = {
+    content: 'paragraph*',
+    attrs: {
+        id: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block',
+    toDOM: () => ['general-table-footnote', 0],
+};

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

@@ -18,7 +18,7 @@ export const tableElementFooter = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(paragraph | footnotes_element)*',
+    content: 'general_table_footnote? footnotes_element?',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

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

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 export const title = {
-    content: 'text*',
-    marks: 'italic smallcaps subscript superscript tracked_insert tracked_delete',
+    content: '(text | highlight_marker)*',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

package/dist/es/transformer/decode.js

@@ -160,7 +160,9 @@ export class Decoder {
         this.creators = {
             [ObjectTypes.Titles]: (data) => {
                 const model = data;
-                return this.parseContents(model.title, 'div', undefined, {
+                const comments = this.createCommentNodes(model);
+                comments.forEach((c) => this.comments.set(c.attrs.id, c));
+                return this.parseContents(model.title, 'div', this.getComments(model), {
                     topNode: schema.nodes.title.create({
                         id: model._id,
                     }),
@@ -481,10 +483,32 @@ export class Decoder {
             },
             [ObjectTypes.TableElementFooter]: (data) => {
                 const model = data;
-                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
+                const contents = [];
+                const generalTableFootnotes = [];
+                const footnotesElements = [];
+                for (const containedObjectID of model.containedObjectIDs) {
+                    const model = this.modelMap.get(containedObjectID);
+                    if (model.objectType === ObjectTypes.ParagraphElement) {
+                        const paragraph = this.decode(model);
+                        if (paragraph) {
+                            generalTableFootnotes.push(paragraph);
+                        }
+                    }
+                    else {
+                        footnotesElements.push(this.decode(model));
+                    }
+                }
+                if (generalTableFootnotes && generalTableFootnotes.length) {
+                    contents.push(schema.nodes.general_table_footnote.create({}, [
+                        ...generalTableFootnotes,
+                    ]));
+                }
+                if (footnotesElements && footnotesElements.length) {
+                    contents.push(...footnotesElements);
+                }
                 return schema.nodes.table_element_footer.create({
                     id: model._id,
-                }, content);
+                }, contents);
             },
             [ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;

package/dist/es/transformer/encode.js

@@ -202,6 +202,18 @@ const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
 };
+const tableElementFooterContainedIDs = (node) => {
+    const containedGeneralTableFootnoteIDs = containedObjectIDs(node, [
+        schema.nodes.footnotes_element,
+    ]);
+    for (let i = 0; i < node.childCount; i++) {
+        const childNode = node.child(i);
+        if (childNode.type === schema.nodes.general_table_footnote) {
+            containedGeneralTableFootnoteIDs.push(...containedObjectIDs(childNode));
+        }
+    }
+    return containedGeneralTableFootnoteIDs;
+};
 const containedObjectIDs = (node, nodeTypes) => {
     const ids = [];
     for (let i = 0; i < node.childCount; i++) {
@@ -374,7 +386,7 @@ const encoders = {
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     table_element_footer: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
+        containedObjectIDs: tableElementFooterContainedIDs(node),
     }),
     author_notes: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
@@ -549,6 +561,7 @@ const containerTypes = [
     schema.nodes.abstracts,
     schema.nodes.body,
     schema.nodes.backmatter,
+    schema.nodes.general_table_footnote,
 ];
 const placeholderTypes = [
     schema.nodes.placeholder,

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

@@ -34,6 +34,7 @@ export * from './nodes/equation_element';
 export * from './nodes/figcaption';
 export * from './nodes/figure';
 export * from './nodes/figure_element';
+export * from './nodes/general_table_footnote';
 export * from './nodes/footnote';
 export * from './nodes/footnotes_element';
 export * from './nodes/footnotes_section';

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

@@ -0,0 +1,25 @@
+/*!
+ * © 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 { NodeSpec } from 'prosemirror-model';
+import { ManuscriptNode } from '../types';
+interface Attrs {
+    id: string;
+}
+export interface GeneralTableFootnote extends ManuscriptNode {
+    attrs: Attrs;
+}
+export declare const generalTableFootnote: NodeSpec;
+export {};

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_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'table_header' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'author_notes' | 'corresp';
+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' | 'table_header' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'author_notes' | 'corresp' | 'general_table_footnote';
 export type ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.3.2",
+  "version": "2.3.3-LEAN-3519-0",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -78,4 +78,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}