@manuscripts/transform 2.1.1-LEAN-3376-0 → 2.1.1-LEAN-3352-1

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

@@ -45,6 +45,11 @@ exports.jatsFrontParser = {
         }
         return titles;
     },
+    parseDOI(front) {
+        var _a;
+        const doi = front === null || front === void 0 ? void 0 : front.querySelector('article-meta > article-id[pub-id-type="doi"]');
+        return (_a = doi === null || doi === void 0 ? void 0 : doi.textContent) !== null && _a !== void 0 ? _a : undefined;
+    },
     parseCounts(counts) {
         var _a, _b, _c, _d, _e;
         if (counts) {
@@ -189,13 +194,6 @@ exports.jatsFrontParser = {
             footnoteIDs,
         };
     },
-    parseAuthorNotesParagraphs(elements) {
-        const paragraphs = [];
-        elements.forEach((p) => {
-            paragraphs.push((0, transformer_1.buildParagraph)(p.innerHTML));
-        });
-        return paragraphs;
-    },
     parseCorresp(elements) {
         const correspondingIDs = new Map();
         const correspondingList = elements.map((element) => {

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

@@ -31,6 +31,7 @@ const parseJATSFront = (doc, front) => {
     const createElement = createElementFn(doc);
     const journal = jats_front_parser_1.jatsFrontParser.parseJournal(front.querySelector('journal-meta'));
     const titles = jats_front_parser_1.jatsFrontParser.parseTitles(front.querySelector('article-meta > title-group'), createElement);
+    const DOI = jats_front_parser_1.jatsFrontParser.parseDOI(front);
     const { affiliations, affiliationIDs } = jats_front_parser_1.jatsFrontParser.parseAffiliations([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -40,22 +41,16 @@ const parseJATSFront = (doc, front) => {
     const { correspondingList, correspondingIDs } = jats_front_parser_1.jatsFrontParser.parseCorresp([
         ...front.querySelectorAll('article-meta > author-notes > corresp'),
     ]);
-    const authorNotesParagraphs = jats_front_parser_1.jatsFrontParser.parseAuthorNotesParagraphs([
-        ...front.querySelectorAll('article-meta > author-notes > p'),
-    ]);
-    const authorNotes = (0, transformer_1.buildAuthorNotes)(Array.from(footnoteIDs.values()).concat(authorNotesParagraphs.map((p) => p._id)));
     const authors = jats_front_parser_1.jatsFrontParser.parseContributors([
         ...front.querySelectorAll('article-meta > contrib-group > contrib[contrib-type="author"]'),
     ], affiliationIDs, footnoteIDs, correspondingIDs);
     const history = jats_front_parser_1.jatsFrontParser.parseDates(front.querySelector('article-meta > history'));
     const counts = jats_front_parser_1.jatsFrontParser.parseCounts(front.querySelector('article-meta counts'));
-    const manuscript = Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), counts), history);
+    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, (0, builders_1.buildManuscript)()), counts), history), { DOI });
     return generateIDs([
         manuscript,
         titles,
         journal,
-        ...authorNotesParagraphs,
-        authorNotes,
         ...footnotes,
         ...authors,
         ...affiliations,

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

@@ -248,7 +248,7 @@ class JATSExporter {
             }
         };
         this.buildFront = (doi, id, links) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const manuscript = (0, project_bundle_1.findManuscript)(this.modelMap);
             const titles = (0, project_bundle_1.findTitles)(this.modelMap);
             const front = this.document.createElement('front');
@@ -311,10 +311,10 @@ class JATSExporter {
                 articleID.textContent = id;
                 articleMeta.appendChild(articleID);
             }
-            if (doi) {
+            if (doi || manuscript.DOI) {
                 const articleID = this.document.createElement('article-id');
                 articleID.setAttribute('pub-id-type', 'doi');
-                articleID.textContent = doi;
+                articleID.textContent = (_a = manuscript.DOI) !== null && _a !== void 0 ? _a : doi;
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
@@ -349,14 +349,14 @@ class JATSExporter {
                 for (const supplement of supplements) {
                     const supplementaryMaterial = this.document.createElement('supplementary-material');
                     supplementaryMaterial.setAttribute('id', normalizeID(supplement._id));
-                    supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', (_a = supplement.href) !== null && _a !== void 0 ? _a : '');
-                    const mimeType = (_b = supplement.MIME) === null || _b === void 0 ? void 0 : _b.split('/')[0];
-                    const mimeSubType = (_c = supplement.MIME) === null || _c === void 0 ? void 0 : _c.split('/')[1];
+                    supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', (_b = supplement.href) !== null && _b !== void 0 ? _b : '');
+                    const mimeType = (_c = supplement.MIME) === null || _c === void 0 ? void 0 : _c.split('/')[0];
+                    const mimeSubType = (_d = supplement.MIME) === null || _d === void 0 ? void 0 : _d.split('/')[1];
                     supplementaryMaterial.setAttribute('mimetype', mimeType !== null && mimeType !== void 0 ? mimeType : '');
                     supplementaryMaterial.setAttribute('mime-subtype', mimeSubType !== null && mimeSubType !== void 0 ? mimeSubType : '');
                     const caption = this.document.createElement('caption');
                     const title = this.document.createElement('title');
-                    title.textContent = (_d = supplement.title) !== null && _d !== void 0 ? _d : '';
+                    title.textContent = (_e = supplement.title) !== null && _e !== void 0 ? _e : '';
                     caption.append(title);
                     supplementaryMaterial.append(caption);
                     articleMeta.append(supplementaryMaterial);
@@ -614,7 +614,6 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                author_notes: () => ['author-notes', 0],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -1253,23 +1252,49 @@ class JATSExporter {
                         }
                     });
                 }
-                const authorNotes = this.models.find((0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.AuthorNotes));
-                if (authorNotes) {
+                const noteIDs = [];
+                for (const contributor of [...authorContributors, ...otherContributors]) {
+                    if (contributor.footnote) {
+                        const ids = contributor.footnote.map((note) => {
+                            return note.noteID;
+                        });
+                        noteIDs.push(...ids);
+                    }
+                    if (contributor.corresp) {
+                        const ids = contributor.corresp.map((corresp) => {
+                            return corresp.correspID;
+                        });
+                        noteIDs.push(...ids);
+                    }
+                }
+                const footnotes = [];
+                footnotes.push(...this.models.filter((0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.Footnote)));
+                const correspodings = [];
+                correspodings.push(...this.models.filter((0, object_types_1.hasObjectType)(json_schema_1.ObjectTypes.Corresponding)));
+                if (footnotes || correspodings) {
                     const authorNotesEl = this.document.createElement('author-notes');
-                    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('MPCorresponding')) {
-                            this.appendCorrespondingToElement(model, authorNotesEl);
-                        }
-                        else if (id.startsWith('MPFootnote')) {
-                            this.appendFootnoteToElement(model, authorNotesEl);
+                    const usedFootnotes = footnotes.filter((footnote) => {
+                        return noteIDs.includes(footnote._id);
+                    });
+                    const usedCorrespodings = correspodings.filter((corresp) => {
+                        return noteIDs.includes(corresp._id);
+                    });
+                    usedFootnotes.forEach((footnote) => {
+                        const authorFootNote = this.document.createElement('fn');
+                        authorFootNote.setAttribute('id', normalizeID(footnote._id));
+                        authorFootNote.innerHTML = footnote.contents;
+                        authorNotesEl.appendChild(authorFootNote);
+                    });
+                    usedCorrespodings.forEach((corresponding) => {
+                        const correspondingEl = this.document.createElement('corresp');
+                        correspondingEl.setAttribute('id', normalizeID(corresponding._id));
+                        if (corresponding.label) {
+                            const labelEl = this.document.createElement('label');
+                            labelEl.textContent = corresponding.label;
+                            correspondingEl.appendChild(labelEl);
                         }
+                        correspondingEl.append(corresponding.contents);
+                        authorNotesEl.appendChild(correspondingEl);
                     });
                     if (authorNotesEl.childNodes.length > 0) {
                         articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
@@ -1277,29 +1302,6 @@ class JATSExporter {
                 }
             }
         };
-        this.appendParagraphToElement = (paragraph, element) => {
-            const paragraphEl = this.document.createElement('p');
-            paragraphEl.setAttribute('id', normalizeID(paragraph._id));
-            paragraphEl.innerHTML = paragraph.contents;
-            element.appendChild(paragraphEl);
-        };
-        this.appendCorrespondingToElement = (corresponding, element) => {
-            const correspondingEl = this.document.createElement('corresp');
-            correspondingEl.setAttribute('id', normalizeID(corresponding._id));
-            if (corresponding.label) {
-                const labelEl = this.document.createElement('label');
-                labelEl.textContent = corresponding.label;
-                correspondingEl.appendChild(labelEl);
-            }
-            correspondingEl.append(corresponding.contents);
-            element.appendChild(correspondingEl);
-        };
-        this.appendFootnoteToElement = (footnote, element) => {
-            const footnoteEl = this.document.createElement('fn');
-            footnoteEl.setAttribute('id', normalizeID(footnote._id));
-            footnoteEl.innerHTML = footnote.contents;
-            element.appendChild(footnoteEl);
-        };
         this.fixBody = (body, fragment) => {
             fragment.descendants((node) => {
                 if (node.attrs.id) {

package/dist/cjs/schema/index.js

@@ -36,7 +36,6 @@ const abstracts_1 = require("./nodes/abstracts");
 const affiliation_1 = require("./nodes/affiliation");
 const affiliations_1 = require("./nodes/affiliations");
 const attribution_1 = require("./nodes/attribution");
-const author_notes_1 = require("./nodes/author_notes");
 const backmatter_1 = require("./nodes/backmatter");
 const bibliography_element_1 = require("./nodes/bibliography_element");
 const bibliography_item_1 = require("./nodes/bibliography_item");
@@ -231,6 +230,5 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
-        author_notes: author_notes_1.authorNotes,
     },
 });

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contributors = void 0;
 exports.contributors = {
-    content: 'contributor* author_notes',
+    content: 'contributor*',
     attrs: {
         id: { default: '' },
     },

package/dist/cjs/transformer/builders.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTitles = exports.buildElementsOrder = exports.auxiliaryObjectTypes = exports.buildJournal = exports.buildAttribution = exports.buildContributorRole = exports.buildContribution = exports.buildColor = exports.buildParagraph = exports.buildSection = exports.buildCorresp = exports.buildFootnotesOrder = exports.buildAuthorNotes = exports.buildFootnote = exports.buildInlineMathFragment = exports.buildNote = exports.buildComment = exports.buildSupplementaryMaterial = exports.buildAffiliation = exports.buildFigure = exports.buildKeywordGroup = exports.buildKeyword = exports.buildBibliographyElement = exports.buildBibliographicDate = exports.buildBibliographicName = exports.buildBibliographyItem = exports.buildContributor = exports.buildManuscript = exports.buildProject = void 0;
+exports.buildTitles = exports.buildElementsOrder = exports.auxiliaryObjectTypes = exports.buildJournal = exports.buildAttribution = exports.buildContributorRole = exports.buildContribution = exports.buildColor = exports.buildParagraph = exports.buildSection = exports.buildCorresp = exports.buildFootnotesOrder = exports.buildFootnote = exports.buildInlineMathFragment = exports.buildNote = exports.buildComment = exports.buildSupplementaryMaterial = exports.buildAffiliation = exports.buildFigure = exports.buildKeywordGroup = exports.buildKeyword = exports.buildBibliographyElement = exports.buildBibliographicDate = exports.buildBibliographicName = exports.buildBibliographyItem = exports.buildContributor = exports.buildManuscript = exports.buildProject = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const w3c_xmlserializer_1 = __importDefault(require("w3c-xmlserializer"));
 const schema_1 = require("../schema");
@@ -130,12 +130,6 @@ const buildFootnote = (containingObject, contents, kind = 'footnote') => ({
     kind,
 });
 exports.buildFootnote = buildFootnote;
-const buildAuthorNotes = (containedObjectIDs) => ({
-    _id: (0, id_1.generateID)(json_schema_1.ObjectTypes.AuthorNotes),
-    objectType: json_schema_1.ObjectTypes.AuthorNotes,
-    containedObjectIDs: containedObjectIDs,
-});
-exports.buildAuthorNotes = buildAuthorNotes;
 const buildFootnotesOrder = (footnotesList) => ({
     _id: (0, id_1.generateID)(json_schema_1.ObjectTypes.FootnotesOrder),
     objectType: json_schema_1.ObjectTypes.FootnotesOrder,

package/dist/cjs/transformer/decode.js

@@ -62,7 +62,6 @@ const sortSectionsByPriority = (a, b) => a.priority === b.priority ? 0 : Number(
 exports.sortSectionsByPriority = sortSectionsByPriority;
 const getSections = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Section).sort(exports.sortSectionsByPriority);
 const getAffiliations = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Affiliation);
-const getAuthorNotes = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.AuthorNotes);
 const getContributors = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Contributor);
 const getKeywordElements = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.KeywordsElement);
 const getSupplements = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Supplement);
@@ -93,11 +92,7 @@ class Decoder {
         const contributors = getContributors(this.modelMap)
             .map((c) => this.decode(c))
             .filter(Boolean);
-        const authorNotes = getAuthorNotes(this.modelMap)
-            .map((authorNote) => this.decode(authorNote))
-            .filter(Boolean);
-        const content = [...contributors, ...authorNotes];
-        return schema_1.schema.nodes.contributors.createAndFill({}, content);
+        return schema_1.schema.nodes.contributors.createAndFill({}, contributors);
     }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
@@ -496,13 +491,6 @@ class Decoder {
                     id: model._id,
                 }, content);
             },
-            [json_schema_1.ObjectTypes.AuthorNotes]: (data) => {
-                const model = data;
-                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
-                return schema_1.schema.nodes.author_notes.create({
-                    id: model._id,
-                }, content);
-            },
             [json_schema_1.ObjectTypes.Section]: (data) => {
                 const model = data;
                 const elements = [];

package/dist/cjs/transformer/encode.js

@@ -395,9 +395,6 @@ const encoders = {
     table_element_footer: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
     }),
-    author_notes: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
-    }),
     footnotes_section: (node, parent, path, priority) => ({
         category: (0, section_category_1.buildSectionCategory)(node),
         priority: priority.value++,

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

@@ -62,8 +62,6 @@ exports.nodeTypesMap = new Map([
     [schema_1.schema.nodes.affiliations, json_schema_1.ObjectTypes.Section],
     [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

@@ -15,7 +15,7 @@
  */
 import debug from 'debug';
 import { getTrimmedTextContent } from '../../lib/utils';
-import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildJournal, buildParagraph, buildTitles, } from '../../transformer';
+import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildJournal, buildTitles, } from '../../transformer';
 import { parseJournalMeta } from './jats-journal-meta-parser';
 import { htmlFromJatsNode } from './jats-parser-utils';
 const warn = debug('manuscripts-transform');
@@ -39,6 +39,11 @@ export const jatsFrontParser = {
         }
         return titles;
     },
+    parseDOI(front) {
+        var _a;
+        const doi = front === null || front === void 0 ? void 0 : front.querySelector('article-meta > article-id[pub-id-type="doi"]');
+        return (_a = doi === null || doi === void 0 ? void 0 : doi.textContent) !== null && _a !== void 0 ? _a : undefined;
+    },
     parseCounts(counts) {
         var _a, _b, _c, _d, _e;
         if (counts) {
@@ -183,13 +188,6 @@ export const jatsFrontParser = {
             footnoteIDs,
         };
     },
-    parseAuthorNotesParagraphs(elements) {
-        const paragraphs = [];
-        elements.forEach((p) => {
-            paragraphs.push(buildParagraph(p.innerHTML));
-        });
-        return paragraphs;
-    },
     parseCorresp(elements) {
         const correspondingIDs = new Map();
         const correspondingList = elements.map((element) => {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { InvalidInput } from '../../errors';
-import { buildAuthorNotes, buildBibliographyElement, buildSection, encode, } from '../../transformer';
+import { buildBibliographyElement, buildSection, encode, } from '../../transformer';
 import { buildManuscript } from '../../transformer/builders';
 import { generateID } from '../../transformer/id';
 import { findManuscript } from '../../transformer/project-bundle';
@@ -28,6 +28,7 @@ export const parseJATSFront = (doc, front) => {
     const createElement = createElementFn(doc);
     const journal = jatsFrontParser.parseJournal(front.querySelector('journal-meta'));
     const titles = jatsFrontParser.parseTitles(front.querySelector('article-meta > title-group'), createElement);
+    const DOI = jatsFrontParser.parseDOI(front);
     const { affiliations, affiliationIDs } = jatsFrontParser.parseAffiliations([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -37,22 +38,16 @@ export const parseJATSFront = (doc, front) => {
     const { correspondingList, correspondingIDs } = jatsFrontParser.parseCorresp([
         ...front.querySelectorAll('article-meta > author-notes > corresp'),
     ]);
-    const authorNotesParagraphs = jatsFrontParser.parseAuthorNotesParagraphs([
-        ...front.querySelectorAll('article-meta > author-notes > p'),
-    ]);
-    const authorNotes = buildAuthorNotes(Array.from(footnoteIDs.values()).concat(authorNotesParagraphs.map((p) => p._id)));
     const authors = jatsFrontParser.parseContributors([
         ...front.querySelectorAll('article-meta > contrib-group > contrib[contrib-type="author"]'),
     ], affiliationIDs, footnoteIDs, correspondingIDs);
     const history = jatsFrontParser.parseDates(front.querySelector('article-meta > history'));
     const counts = jatsFrontParser.parseCounts(front.querySelector('article-meta counts'));
-    const manuscript = Object.assign(Object.assign(Object.assign({}, buildManuscript()), counts), history);
+    const manuscript = Object.assign(Object.assign(Object.assign(Object.assign({}, buildManuscript()), counts), history), { DOI });
     return generateIDs([
         manuscript,
         titles,
         journal,
-        ...authorNotesParagraphs,
-        authorNotes,
         ...footnotes,
         ...authors,
         ...affiliations,

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

@@ -240,7 +240,7 @@ export class JATSExporter {
             }
         };
         this.buildFront = (doi, id, links) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const manuscript = findManuscript(this.modelMap);
             const titles = findTitles(this.modelMap);
             const front = this.document.createElement('front');
@@ -303,10 +303,10 @@ export class JATSExporter {
                 articleID.textContent = id;
                 articleMeta.appendChild(articleID);
             }
-            if (doi) {
+            if (doi || manuscript.DOI) {
                 const articleID = this.document.createElement('article-id');
                 articleID.setAttribute('pub-id-type', 'doi');
-                articleID.textContent = doi;
+                articleID.textContent = (_a = manuscript.DOI) !== null && _a !== void 0 ? _a : doi;
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
@@ -341,14 +341,14 @@ export class JATSExporter {
                 for (const supplement of supplements) {
                     const supplementaryMaterial = this.document.createElement('supplementary-material');
                     supplementaryMaterial.setAttribute('id', normalizeID(supplement._id));
-                    supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', (_a = supplement.href) !== null && _a !== void 0 ? _a : '');
-                    const mimeType = (_b = supplement.MIME) === null || _b === void 0 ? void 0 : _b.split('/')[0];
-                    const mimeSubType = (_c = supplement.MIME) === null || _c === void 0 ? void 0 : _c.split('/')[1];
+                    supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', (_b = supplement.href) !== null && _b !== void 0 ? _b : '');
+                    const mimeType = (_c = supplement.MIME) === null || _c === void 0 ? void 0 : _c.split('/')[0];
+                    const mimeSubType = (_d = supplement.MIME) === null || _d === void 0 ? void 0 : _d.split('/')[1];
                     supplementaryMaterial.setAttribute('mimetype', mimeType !== null && mimeType !== void 0 ? mimeType : '');
                     supplementaryMaterial.setAttribute('mime-subtype', mimeSubType !== null && mimeSubType !== void 0 ? mimeSubType : '');
                     const caption = this.document.createElement('caption');
                     const title = this.document.createElement('title');
-                    title.textContent = (_d = supplement.title) !== null && _d !== void 0 ? _d : '';
+                    title.textContent = (_e = supplement.title) !== null && _e !== void 0 ? _e : '';
                     caption.append(title);
                     supplementaryMaterial.append(caption);
                     articleMeta.append(supplementaryMaterial);
@@ -606,7 +606,6 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                author_notes: () => ['author-notes', 0],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
@@ -1245,23 +1244,49 @@ export class JATSExporter {
                         }
                     });
                 }
-                const authorNotes = this.models.find(hasObjectType(ObjectTypes.AuthorNotes));
-                if (authorNotes) {
+                const noteIDs = [];
+                for (const contributor of [...authorContributors, ...otherContributors]) {
+                    if (contributor.footnote) {
+                        const ids = contributor.footnote.map((note) => {
+                            return note.noteID;
+                        });
+                        noteIDs.push(...ids);
+                    }
+                    if (contributor.corresp) {
+                        const ids = contributor.corresp.map((corresp) => {
+                            return corresp.correspID;
+                        });
+                        noteIDs.push(...ids);
+                    }
+                }
+                const footnotes = [];
+                footnotes.push(...this.models.filter(hasObjectType(ObjectTypes.Footnote)));
+                const correspodings = [];
+                correspodings.push(...this.models.filter(hasObjectType(ObjectTypes.Corresponding)));
+                if (footnotes || correspodings) {
                     const authorNotesEl = this.document.createElement('author-notes');
-                    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('MPCorresponding')) {
-                            this.appendCorrespondingToElement(model, authorNotesEl);
-                        }
-                        else if (id.startsWith('MPFootnote')) {
-                            this.appendFootnoteToElement(model, authorNotesEl);
+                    const usedFootnotes = footnotes.filter((footnote) => {
+                        return noteIDs.includes(footnote._id);
+                    });
+                    const usedCorrespodings = correspodings.filter((corresp) => {
+                        return noteIDs.includes(corresp._id);
+                    });
+                    usedFootnotes.forEach((footnote) => {
+                        const authorFootNote = this.document.createElement('fn');
+                        authorFootNote.setAttribute('id', normalizeID(footnote._id));
+                        authorFootNote.innerHTML = footnote.contents;
+                        authorNotesEl.appendChild(authorFootNote);
+                    });
+                    usedCorrespodings.forEach((corresponding) => {
+                        const correspondingEl = this.document.createElement('corresp');
+                        correspondingEl.setAttribute('id', normalizeID(corresponding._id));
+                        if (corresponding.label) {
+                            const labelEl = this.document.createElement('label');
+                            labelEl.textContent = corresponding.label;
+                            correspondingEl.appendChild(labelEl);
                         }
+                        correspondingEl.append(corresponding.contents);
+                        authorNotesEl.appendChild(correspondingEl);
                     });
                     if (authorNotesEl.childNodes.length > 0) {
                         articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
@@ -1269,29 +1294,6 @@ export class JATSExporter {
                 }
             }
         };
-        this.appendParagraphToElement = (paragraph, element) => {
-            const paragraphEl = this.document.createElement('p');
-            paragraphEl.setAttribute('id', normalizeID(paragraph._id));
-            paragraphEl.innerHTML = paragraph.contents;
-            element.appendChild(paragraphEl);
-        };
-        this.appendCorrespondingToElement = (corresponding, element) => {
-            const correspondingEl = this.document.createElement('corresp');
-            correspondingEl.setAttribute('id', normalizeID(corresponding._id));
-            if (corresponding.label) {
-                const labelEl = this.document.createElement('label');
-                labelEl.textContent = corresponding.label;
-                correspondingEl.appendChild(labelEl);
-            }
-            correspondingEl.append(corresponding.contents);
-            element.appendChild(correspondingEl);
-        };
-        this.appendFootnoteToElement = (footnote, element) => {
-            const footnoteEl = this.document.createElement('fn');
-            footnoteEl.setAttribute('id', normalizeID(footnote._id));
-            footnoteEl.innerHTML = footnote.contents;
-            element.appendChild(footnoteEl);
-        };
         this.fixBody = (body, fragment) => {
             fragment.descendants((node) => {
                 if (node.attrs.id) {

package/dist/es/schema/index.js

@@ -19,7 +19,6 @@ import { abstracts } from './nodes/abstracts';
 import { affiliation } from './nodes/affiliation';
 import { affiliations } from './nodes/affiliations';
 import { attribution } from './nodes/attribution';
-import { authorNotes } from './nodes/author_notes';
 import { backmatter } from './nodes/backmatter';
 import { bibliographyElement } from './nodes/bibliography_element';
 import { bibliographyItem } from './nodes/bibliography_item';
@@ -214,6 +213,5 @@ export const schema = new Schema({
         contributors,
         supplements,
         supplement,
-        author_notes: authorNotes,
     },
 });

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const contributors = {
-    content: 'contributor* author_notes',
+    content: 'contributor*',
     attrs: {
         id: { default: '' },
     },

package/dist/es/transformer/builders.js

@@ -108,11 +108,6 @@ export const buildFootnote = (containingObject, contents, kind = 'footnote') =>
     contents,
     kind,
 });
-export const buildAuthorNotes = (containedObjectIDs) => ({
-    _id: generateID(ObjectTypes.AuthorNotes),
-    objectType: ObjectTypes.AuthorNotes,
-    containedObjectIDs: containedObjectIDs,
-});
 export const buildFootnotesOrder = (footnotesList) => ({
     _id: generateID(ObjectTypes.FootnotesOrder),
     objectType: ObjectTypes.FootnotesOrder,

package/dist/es/transformer/decode.js

@@ -53,7 +53,6 @@ export const getModelsByType = (modelMap, objectType) => {
 export const sortSectionsByPriority = (a, b) => a.priority === b.priority ? 0 : Number(a.priority) - Number(b.priority);
 const getSections = (modelMap) => getModelsByType(modelMap, ObjectTypes.Section).sort(sortSectionsByPriority);
 const getAffiliations = (modelMap) => getModelsByType(modelMap, ObjectTypes.Affiliation);
-const getAuthorNotes = (modelMap) => getModelsByType(modelMap, ObjectTypes.AuthorNotes);
 const getContributors = (modelMap) => getModelsByType(modelMap, ObjectTypes.Contributor);
 const getKeywordElements = (modelMap) => getModelsByType(modelMap, ObjectTypes.KeywordsElement);
 const getSupplements = (modelMap) => getModelsByType(modelMap, ObjectTypes.Supplement);
@@ -84,11 +83,7 @@ export class Decoder {
         const contributors = getContributors(this.modelMap)
             .map((c) => this.decode(c))
             .filter(Boolean);
-        const authorNotes = getAuthorNotes(this.modelMap)
-            .map((authorNote) => this.decode(authorNote))
-            .filter(Boolean);
-        const content = [...contributors, ...authorNotes];
-        return schema.nodes.contributors.createAndFill({}, content);
+        return schema.nodes.contributors.createAndFill({}, contributors);
     }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
@@ -487,13 +482,6 @@ export class Decoder {
                     id: model._id,
                 }, content);
             },
-            [ObjectTypes.AuthorNotes]: (data) => {
-                const model = data;
-                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
-                return schema.nodes.author_notes.create({
-                    id: model._id,
-                }, content);
-            },
             [ObjectTypes.Section]: (data) => {
                 const model = data;
                 const elements = [];

package/dist/es/transformer/encode.js

@@ -387,9 +387,6 @@ const encoders = {
     table_element_footer: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
     }),
-    author_notes: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
-    }),
     footnotes_section: (node, parent, path, priority) => ({
         category: buildSectionCategory(node),
         priority: priority.value++,

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

@@ -59,8 +59,6 @@ export const nodeTypesMap = new Map([
     [schema.nodes.affiliations, ObjectTypes.Section],
     [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/importer/jats-front-parser.d.ts

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ParagraphElement } from '@manuscripts/json-schema';
-import { Build } from '../../transformer';
 export declare const jatsFrontParser: {
-    parseTitles(element: Element | null, createElement: (tagName: string) => HTMLElement): Build<import("@manuscripts/json-schema").Titles>;
+    parseTitles(element: Element | null, createElement: (tagName: string) => HTMLElement): import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Titles>;
+    parseDOI(front: Element | null): string | undefined;
     parseCounts(counts: Element | null): {
         wordCount: number | undefined;
         figureCount: number | undefined;
@@ -50,7 +49,7 @@ export declare const jatsFrontParser: {
         publisherName: string | undefined;
         _id: string;
         objectType: string;
-        contributions?: import("@manuscripts/json-schema").Contribution[] | undefined;
+        contributions?: import("@manuscripts/json-schema/dist/types").Contribution[] | undefined;
     };
     parseDates(historyNode: Element | null): {
         acceptanceDate?: number | undefined;
@@ -61,17 +60,16 @@ export declare const jatsFrontParser: {
         receiveDate?: number | undefined;
     } | undefined;
     parseAffiliations(elements: Element[]): {
-        affiliations: Build<import("@manuscripts/json-schema").Affiliation>[];
+        affiliations: import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Affiliation>[];
         affiliationIDs: Map<string, string>;
     };
     parseAuthorNotes(elements: Element[]): {
-        footnotes: Build<import("@manuscripts/json-schema").Footnote>[];
+        footnotes: import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Footnote>[];
         footnoteIDs: Map<string, string>;
     };
-    parseAuthorNotesParagraphs(elements: Element[]): Build<ParagraphElement>[];
     parseCorresp(elements: Element[]): {
-        correspondingList: Build<import("@manuscripts/json-schema").Corresponding>[];
+        correspondingList: import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Corresponding>[];
         correspondingIDs: Map<string, string>;
     };
-    parseContributors(elements: Element[], affiliationIDs: Map<string, string>, footnoteIDs: Map<string, string>, correspondingIDs: Map<string, string>): Build<import("@manuscripts/json-schema").Contributor>[];
+    parseContributors(elements: Element[], affiliationIDs: Map<string, string>, footnoteIDs: Map<string, string>, correspondingIDs: Map<string, string>): import("../../transformer").Build<import("@manuscripts/json-schema/dist/types").Contributor>[];
 };

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

@@ -86,9 +86,6 @@ export declare class JATSExporter {
     protected serializeNode: (node: ManuscriptNode) => Node;
     private validateContributor;
     private buildContributors;
-    private appendParagraphToElement;
-    private appendCorrespondingToElement;
-    private appendFootnoteToElement;
     private buildKeywords;
     private fixBody;
     private changeTag;

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

package/dist/types/transformer/builders.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Affiliation, Attribution, AuthorNotes, BibliographicDate, BibliographicName, BibliographyElement, BibliographyItem, Color, CommentAnnotation, Contribution, Contributor, ContributorRole, Corresponding, ElementsOrder, EmbeddedModel, Figure, Footnote, FootnotesOrder, InlineMathFragment, Journal, Keyword, KeywordGroup, Manuscript, ManuscriptNote, ObjectTypes, ParagraphElement, Project, Section, Supplement, Titles } from '@manuscripts/json-schema';
+import { Affiliation, Attribution, BibliographicDate, BibliographicName, BibliographyElement, BibliographyItem, Color, CommentAnnotation, Contribution, Contributor, ContributorRole, Corresponding, ElementsOrder, EmbeddedModel, Figure, Footnote, FootnotesOrder, InlineMathFragment, Journal, Keyword, KeywordGroup, Manuscript, ManuscriptNote, ObjectTypes, ParagraphElement, Project, Section, Supplement, Titles } from '@manuscripts/json-schema';
 import { FootnotesOrderIndexList } from './footnotes-order';
 import { CommentSelector, ManuscriptModel, ModelAttachment } from './models';
 export type Build<T> = Pick<T, Exclude<keyof T, keyof ManuscriptModel>> & {
@@ -46,7 +46,6 @@ export declare const buildComment: (target: string, contents?: string, selector?
 export declare const buildNote: (target: string, source: 'EMAIL' | 'EDITOR' | 'DASHBOARD', contents?: string) => Build<ManuscriptNote>;
 export declare const buildInlineMathFragment: (containingObject: string, TeXRepresentation: string) => Build<InlineMathFragment>;
 export declare const buildFootnote: (containingObject: string, contents: string, kind?: 'footnote' | 'endnote') => Build<Footnote>;
-export declare const buildAuthorNotes: (containedObjectIDs: string[]) => Build<AuthorNotes>;
 export declare const buildFootnotesOrder: (footnotesList: FootnotesOrderIndexList) => Build<FootnotesOrder>;
 export declare const buildCorresp: (contents: string) => Build<Corresponding>;
 export declare const buildSection: (priority?: number, path?: string[]) => Build<Section>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.1-LEAN-3376-0",
+  "version": "2.1.1-LEAN-3352-1",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -29,8 +29,8 @@
     "version": "yarn build"
   },
   "dependencies": {
-    "@manuscripts/json-schema": "2.2.3-LEAN-3376-2",
-    "@manuscripts/library": "1.3.2-LEAN-3376-1",
+    "@manuscripts/json-schema": "^2.2.2",
+    "@manuscripts/library": "1.3.2",
     "debug": "^4.3.4",
     "jszip": "^3.10.1",
     "mathjax-full": "^3.2.2",
@@ -78,4 +78,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}

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

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

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

@@ -1,24 +0,0 @@
-/*!
- * © 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 authorNotes = {
-    attrs: {
-        id: { default: '' },
-        dataTracked: { default: null },
-    },
-    content: '(footnote | paragraph)+',
-    group: 'block element',
-    toDOM: () => ['author-notes', 0],
-};

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

@@ -1,25 +0,0 @@
-/*!
- * © 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 AuthorNotesNode extends ManuscriptNode {
-    attrs: Attrs;
-}
-export declare const authorNotes: NodeSpec;
-export {};