@manuscripts/transform 2.1.12-LEAN-CORRESP-0 → 2.1.12-LEAN-2746-1

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

@@ -201,7 +201,6 @@ exports.jatsFrontParser = {
         ]);
         const authorNotes = [
             (0, transformer_1.buildAuthorNotes)([
-                ...correspondingIDs.values(),
                 ...footnoteIDs.values(),
                 ...authorNotesParagraphs.map((p) => p._id),
             ]),

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

@@ -617,7 +617,6 @@ class JATSExporter {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
                 author_notes: () => ['author-notes', 0],
-                corresp: () => '',
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -1048,6 +1047,7 @@ class JATSExporter {
             }
         };
         this.buildContributors = (articleMeta) => {
+            var _a;
             const contributors = this.models.filter(isContributor);
             const authorContributors = contributors
                 .filter((contributor) => contributor.role === 'author')
@@ -1266,21 +1266,34 @@ class JATSExporter {
                         }
                     });
                 }
-                const authorNotesEl = this.createAuthorNotesElement();
+                const authorNotesEl = this.document.createElement('author-notes');
+                const usedCorrespodings = this.getUsedCorrespondings([
+                    ...authorContributors,
+                    ...otherContributors,
+                ]);
+                usedCorrespodings.forEach((corresp) => {
+                    this.appendCorrespondingToElement(corresp, authorNotesEl);
+                });
+                const authorNotes = (_a = (0, json_schema_1.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
+                if (authorNotes) {
+                    authorNotes.containedObjectIDs.forEach((id) => {
+                        const model = this.modelMap.get(id);
+                        if (!model) {
+                            return;
+                        }
+                        if (id.startsWith('MPParagraphElement')) {
+                            this.appendParagraphToElement(model, authorNotesEl);
+                        }
+                        else if (id.startsWith('MPFootnote')) {
+                            this.appendFootnoteToElement(model, authorNotesEl);
+                        }
+                    });
+                }
                 if (authorNotesEl.childNodes.length > 0) {
                     articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                 }
             }
         };
-        this.createAuthorNotesElement = () => {
-            var _a;
-            const authorNotesEl = this.document.createElement('author-notes');
-            const authorNotes = (_a = (0, json_schema_1.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
-            if (authorNotes) {
-                this.appendModelsToAuthorNotes(authorNotesEl, authorNotes.containedObjectIDs);
-            }
-            return authorNotesEl;
-        };
         this.appendCorrespondingToElement = (corresponding, element) => {
             const correspondingEl = this.document.createElement('corresp');
             correspondingEl.setAttribute('id', normalizeID(corresponding._id));
@@ -1610,29 +1623,6 @@ class JATSExporter {
             return mathml;
         }
     }
-    appendModelsToAuthorNotes(authorNotesEl, containedObjectIDs) {
-        const contributors = this.models.filter(isContributor);
-        const usedCorrespondings = this.getUsedCorrespondings(contributors);
-        containedObjectIDs.forEach((id) => {
-            const model = this.modelMap.get(id);
-            if (!model) {
-                return;
-            }
-            switch (model.objectType) {
-                case json_schema_1.ObjectTypes.ParagraphElement:
-                    this.appendParagraphToElement(model, authorNotesEl);
-                    break;
-                case json_schema_1.ObjectTypes.Footnote:
-                    this.appendFootnoteToElement(model, authorNotesEl);
-                    break;
-                case json_schema_1.ObjectTypes.Corresponding:
-                    if (usedCorrespondings.includes(model)) {
-                        this.appendCorrespondingToElement(model, authorNotesEl);
-                    }
-                    break;
-            }
-        });
-    }
     getUsedCorrespondings(contributors) {
         return contributors
             .flatMap((c) => { var _a; return (_a = c.corresp) !== null && _a !== void 0 ? _a : []; })

package/dist/cjs/schema/index.js

@@ -50,7 +50,6 @@ const comment_1 = require("./nodes/comment");
 const comments_1 = require("./nodes/comments");
 const contributor_1 = require("./nodes/contributor");
 const contributors_1 = require("./nodes/contributors");
-const corresp_1 = require("./nodes/corresp");
 const cross_reference_1 = require("./nodes/cross_reference");
 const doc_1 = require("./nodes/doc");
 const equation_1 = require("./nodes/equation");
@@ -230,6 +229,5 @@ exports.schema = new prosemirror_model_1.Schema({
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
         author_notes: author_notes_1.authorNotes,
-        corresp: corresp_1.corresp,
     },
 });

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

@@ -21,7 +21,7 @@ exports.authorNotes = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(corresp | footnote | paragraph)+',
+    content: '(footnote | paragraph)+',
     group: 'block element',
     toDOM: () => ['author-notes', 0],
 };

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

@@ -43,7 +43,7 @@ exports.inlineFootnote = {
         const footnoteNode = node;
         const dom = document.createElement('span');
         dom.className = 'footnote';
-        dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(''));
+        dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(' '));
         dom.textContent = footnoteNode.attrs.contents;
         return dom;
     },

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: 'inline*',
     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,
                     }),
@@ -502,15 +504,6 @@ class Decoder {
                     id: model._id,
                 }, content);
             },
-            [json_schema_1.ObjectTypes.Corresponding]: (data) => {
-                const model = data;
-                return this.parseContents(model.contents, 'corresp', [], {
-                    topNode: schema_1.schema.nodes.corresp.create({
-                        id: model._id,
-                        label: model.label,
-                    }),
-                });
-            },
             [json_schema_1.ObjectTypes.Section]: (data) => {
                 const model = data;
                 const elements = [];

package/dist/cjs/transformer/encode.js

@@ -522,10 +522,6 @@ const encoders = {
             ? [node.attrs.mimeType, node.attrs.mimeSubType].join('/')
             : '',
     }),
-    corresp: (node) => ({
-        contents: (0, exports.inlineContents)(node),
-        label: node.attrs.label,
-    }),
 };
 const modelData = (node, parent, path, priority) => {
     const encoder = encoders[node.type.name];

package/dist/cjs/transformer/node-types.js

@@ -62,7 +62,6 @@ exports.nodeTypesMap = new Map([
     [schema_1.schema.nodes.title, json_schema_1.ObjectTypes.Titles],
     [schema_1.schema.nodes.supplement, json_schema_1.ObjectTypes.Supplement],
     [schema_1.schema.nodes.author_notes, json_schema_1.ObjectTypes.AuthorNotes],
-    [schema_1.schema.nodes.corresp, json_schema_1.ObjectTypes.Corresponding],
 ]);
 const isExecutableNodeType = (type) => (0, schema_1.hasGroup)(type, schema_1.GROUP_EXECUTABLE);
 exports.isExecutableNodeType = isExecutableNodeType;

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

@@ -195,7 +195,6 @@ export const jatsFrontParser = {
         ]);
         const authorNotes = [
             buildAuthorNotes([
-                ...correspondingIDs.values(),
                 ...footnoteIDs.values(),
                 ...authorNotesParagraphs.map((p) => p._id),
             ]),

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

@@ -609,7 +609,6 @@ export class JATSExporter {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
                 author_notes: () => ['author-notes', 0],
-                corresp: () => '',
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -1040,6 +1039,7 @@ export class JATSExporter {
             }
         };
         this.buildContributors = (articleMeta) => {
+            var _a;
             const contributors = this.models.filter(isContributor);
             const authorContributors = contributors
                 .filter((contributor) => contributor.role === 'author')
@@ -1258,21 +1258,34 @@ export class JATSExporter {
                         }
                     });
                 }
-                const authorNotesEl = this.createAuthorNotesElement();
+                const authorNotesEl = this.document.createElement('author-notes');
+                const usedCorrespodings = this.getUsedCorrespondings([
+                    ...authorContributors,
+                    ...otherContributors,
+                ]);
+                usedCorrespodings.forEach((corresp) => {
+                    this.appendCorrespondingToElement(corresp, authorNotesEl);
+                });
+                const authorNotes = (_a = getModelsByType(this.modelMap, ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
+                if (authorNotes) {
+                    authorNotes.containedObjectIDs.forEach((id) => {
+                        const model = this.modelMap.get(id);
+                        if (!model) {
+                            return;
+                        }
+                        if (id.startsWith('MPParagraphElement')) {
+                            this.appendParagraphToElement(model, authorNotesEl);
+                        }
+                        else if (id.startsWith('MPFootnote')) {
+                            this.appendFootnoteToElement(model, authorNotesEl);
+                        }
+                    });
+                }
                 if (authorNotesEl.childNodes.length > 0) {
                     articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                 }
             }
         };
-        this.createAuthorNotesElement = () => {
-            var _a;
-            const authorNotesEl = this.document.createElement('author-notes');
-            const authorNotes = (_a = getModelsByType(this.modelMap, ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
-            if (authorNotes) {
-                this.appendModelsToAuthorNotes(authorNotesEl, authorNotes.containedObjectIDs);
-            }
-            return authorNotesEl;
-        };
         this.appendCorrespondingToElement = (corresponding, element) => {
             const correspondingEl = this.document.createElement('corresp');
             correspondingEl.setAttribute('id', normalizeID(corresponding._id));
@@ -1602,29 +1615,6 @@ export class JATSExporter {
             return mathml;
         }
     }
-    appendModelsToAuthorNotes(authorNotesEl, containedObjectIDs) {
-        const contributors = this.models.filter(isContributor);
-        const usedCorrespondings = this.getUsedCorrespondings(contributors);
-        containedObjectIDs.forEach((id) => {
-            const model = this.modelMap.get(id);
-            if (!model) {
-                return;
-            }
-            switch (model.objectType) {
-                case ObjectTypes.ParagraphElement:
-                    this.appendParagraphToElement(model, authorNotesEl);
-                    break;
-                case ObjectTypes.Footnote:
-                    this.appendFootnoteToElement(model, authorNotesEl);
-                    break;
-                case ObjectTypes.Corresponding:
-                    if (usedCorrespondings.includes(model)) {
-                        this.appendCorrespondingToElement(model, authorNotesEl);
-                    }
-                    break;
-            }
-        });
-    }
     getUsedCorrespondings(contributors) {
         return contributors
             .flatMap((c) => { var _a; return (_a = c.corresp) !== null && _a !== void 0 ? _a : []; })

package/dist/es/schema/index.js

@@ -33,7 +33,6 @@ import { comment } from './nodes/comment';
 import { comments } from './nodes/comments';
 import { contributor } from './nodes/contributor';
 import { contributors } from './nodes/contributors';
-import { corresp } from './nodes/corresp';
 import { crossReference } from './nodes/cross_reference';
 import { doc } from './nodes/doc';
 import { equation } from './nodes/equation';
@@ -213,6 +212,5 @@ export const schema = new Schema({
         supplements,
         supplement,
         author_notes: authorNotes,
-        corresp,
     },
 });

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

@@ -18,7 +18,7 @@ export const authorNotes = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(corresp | footnote | paragraph)+',
+    content: '(footnote | paragraph)+',
     group: 'block element',
     toDOM: () => ['author-notes', 0],
 };

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

@@ -40,7 +40,7 @@ export const inlineFootnote = {
         const footnoteNode = node;
         const dom = document.createElement('span');
         dom.className = 'footnote';
-        dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(''));
+        dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(' '));
         dom.textContent = footnoteNode.attrs.contents;
         return dom;
     },

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: 'inline*',
     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,
                     }),
@@ -493,15 +495,6 @@ export class Decoder {
                     id: model._id,
                 }, content);
             },
-            [ObjectTypes.Corresponding]: (data) => {
-                const model = data;
-                return this.parseContents(model.contents, 'corresp', [], {
-                    topNode: schema.nodes.corresp.create({
-                        id: model._id,
-                        label: model.label,
-                    }),
-                });
-            },
             [ObjectTypes.Section]: (data) => {
                 const model = data;
                 const elements = [];

package/dist/es/transformer/encode.js

@@ -514,10 +514,6 @@ const encoders = {
             ? [node.attrs.mimeType, node.attrs.mimeSubType].join('/')
             : '',
     }),
-    corresp: (node) => ({
-        contents: inlineContents(node),
-        label: node.attrs.label,
-    }),
 };
 const modelData = (node, parent, path, priority) => {
     const encoder = encoders[node.type.name];

package/dist/es/transformer/node-types.js

@@ -59,7 +59,6 @@ export const nodeTypesMap = new Map([
     [schema.nodes.title, ObjectTypes.Titles],
     [schema.nodes.supplement, ObjectTypes.Supplement],
     [schema.nodes.author_notes, ObjectTypes.AuthorNotes],
-    [schema.nodes.corresp, ObjectTypes.Corresponding],
 ]);
 export const isExecutableNodeType = (type) => hasGroup(type, GROUP_EXECUTABLE);
 export const isElementNodeType = (type) => hasGroup(type, GROUP_ELEMENT);

package/dist/types/jats/jats-exporter.d.ts

@@ -87,8 +87,6 @@ export declare class JATSExporter {
     protected serializeNode: (node: ManuscriptNode) => Node;
     private validateContributor;
     private buildContributors;
-    private createAuthorNotesElement;
-    private appendModelsToAuthorNotes;
     private appendCorrespondingToElement;
     private getUsedCorrespondings;
     private appendParagraphToElement;

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';
 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.1.12-LEAN-CORRESP-0",
+  "version": "2.1.12-LEAN-2746-1",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",

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

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.corresp = void 0;
-exports.corresp = {
-    content: 'inline*',
-    attrs: {
-        id: { default: '' },
-        label: { default: undefined },
-        dataTracked: { default: null },
-    },
-    group: 'block',
-    toDOM: () => ['corresp', 0],
-};

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

@@ -1,10 +0,0 @@
-export const corresp = {
-    content: 'inline*',
-    attrs: {
-        id: { default: '' },
-        label: { default: undefined },
-        dataTracked: { default: null },
-    },
-    group: 'block',
-    toDOM: () => ['corresp', 0],
-};

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

@@ -1,11 +0,0 @@
-import { NodeSpec } from 'prosemirror-model';
-import { ManuscriptNode } from '../types';
-interface Attrs {
-    id: string;
-    label?: string;
-}
-export interface CorrespNode extends ManuscriptNode {
-    attrs: Attrs;
-}
-export declare const corresp: NodeSpec;
-export {};