@manuscripts/transform 2.3.38-LEAN-3911.0 → 2.4.0

package/dist/cjs/jats/importer/jats-comments.js

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.markComments = exports.parseJATSComment = exports.isJATSComment = exports.DEFAULT_PROFILE_ID = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
+exports.createReferenceComments = exports.createComments = exports.markComments = exports.parseJATSComment = exports.isJATSComment = void 0;
+const uuid_1 = require("uuid");
 const transformer_1 = require("../../transformer");
-exports.DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
+const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
 const isJATSComment = (node) => {
     return (node.nodeType === node.PROCESSING_INSTRUCTION_NODE &&
         node.nodeName === 'AuthorQuery');
@@ -27,34 +27,35 @@ exports.isJATSComment = isJATSComment;
 const parseJATSComment = (node) => {
     const text = node.textContent;
     if (text) {
+        const id = /id="(.+)"/.exec(text);
         const queryText = /queryText="(.+)"/.exec(text);
-        if (queryText) {
-            const parentNode = node.parentNode;
-            const index = parentNode.outerHTML.indexOf(queryText[1]);
+        if (id && queryText) {
             return {
-                id: (0, transformer_1.generateID)(json_schema_1.ObjectTypes.CommentAnnotation),
+                id: id[1],
                 text: queryText[1],
-                index,
             };
         }
     }
 };
 exports.parseJATSComment = parseJATSComment;
 const markComments = (doc) => {
-    var _a;
+    const marks = [];
     const root = doc.getRootNode();
     const queue = [root];
-    const commentsElement = doc.createElement('comments-annotations');
     while (queue.length !== 0) {
         const node = queue.shift();
         if (node) {
             if ((0, exports.isJATSComment)(node)) {
                 const comment = (0, exports.parseJATSComment)(node);
                 if (comment) {
-                    const highlightMarker = createHighlightMarkerElement(doc, comment.id);
-                    (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(highlightMarker, node);
-                    const commentElement = createCommentElement(doc, comment);
-                    commentsElement.appendChild(commentElement);
+                    const token = addMark(doc, node);
+                    if (token) {
+                        const mark = {
+                            token,
+                            comment,
+                        };
+                        marks.push(mark);
+                    }
                 }
             }
             node.childNodes.forEach((child) => {
@@ -62,20 +63,96 @@ const markComments = (doc) => {
             });
         }
     }
-    if (commentsElement.hasChildNodes()) {
-        doc.documentElement.appendChild(commentsElement);
-    }
+    return marks;
 };
 exports.markComments = markComments;
-const createHighlightMarkerElement = (doc, id) => {
-    const highlightMarker = doc.createElement('highlight-marker');
-    highlightMarker.setAttribute('id', id);
-    highlightMarker.setAttribute('position', 'point');
-    return highlightMarker;
+const addMark = (doc, node) => {
+    const parent = node.parentElement;
+    if (parent) {
+        const token = (0, uuid_1.v4)();
+        const tokenNode = doc.createTextNode(token);
+        parent.insertBefore(tokenNode, node);
+        return token;
+    }
 };
-const createCommentElement = (doc, comment) => {
-    const commentElement = doc.createElement('comment-annotation');
-    commentElement.setAttribute('id', comment.id);
-    commentElement.textContent = comment.text;
-    return commentElement;
+const createComments = (models, marks) => {
+    const comments = [];
+    for (const model of models) {
+        if ((0, transformer_1.isHighlightableModel)(model)) {
+            comments.push(...processModel(model, marks));
+        }
+        else if ((0, transformer_1.isKeyword)(model)) {
+            comments.push(...processKeyword(model, marks));
+        }
+    }
+    return comments;
+};
+exports.createComments = createComments;
+const getFieldMarks = (content, marks) => {
+    return marks
+        .filter((m) => content.indexOf(m.token) >= 0)
+        .sort((a, b) => content.indexOf(a.token) - content.indexOf(b.token));
+};
+const processModel = (model, marks) => {
+    const comments = [];
+    for (const field of transformer_1.highlightableFields) {
+        const content = model[field];
+        if (!content) {
+            continue;
+        }
+        const results = processContent(model, content, getFieldMarks(content, marks));
+        model[field] = results.content;
+        comments.push(...results.comments);
+    }
+    return comments;
+};
+const processKeyword = (model, marks) => {
+    const comments = [];
+    const name = model.name;
+    let content = name;
+    for (const mark of getFieldMarks(name, marks)) {
+        content = name.replace(mark.token, '');
+        const target = model.containedGroup;
+        if (!target) {
+            continue;
+        }
+        const contributions = [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)];
+        const comment = (0, transformer_1.buildComment)(target, mark.comment.text, undefined, contributions);
+        model.name = content;
+        comments.push(comment);
+    }
+    return comments;
+};
+const processContent = (model, content, marks) => {
+    const comments = [];
+    let result = content;
+    for (const mark of marks) {
+        const token = mark.token;
+        const index = result.indexOf(token);
+        result = result.replace(token, '');
+        const contributions = [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)];
+        const selector = {
+            from: index,
+            to: index,
+        };
+        const comment = (0, transformer_1.buildComment)(model._id, mark.comment.text, selector, contributions);
+        comments.push(comment);
+    }
+    return {
+        content: result,
+        comments,
+    };
+};
+const createReferenceComments = (references) => {
+    const comments = [];
+    for (const item of references.getBibliographyItems()) {
+        const id = item._id;
+        for (const comment of references.getComments(id)) {
+            const contributions = [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)];
+            const c = (0, transformer_1.buildComment)(id, comment.text, undefined, contributions);
+            comments.push(c);
+        }
+    }
+    return comments;
 };
+exports.createReferenceComments = createReferenceComments;

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

@@ -0,0 +1,321 @@
+"use strict";
+/*!
+ * © 2020 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.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jatsFrontParser = void 0;
+const debug_1 = __importDefault(require("debug"));
+const utils_1 = require("../../lib/utils");
+const transformer_1 = require("../../transformer");
+const jats_journal_meta_parser_1 = require("./jats-journal-meta-parser");
+const jats_parser_utils_1 = require("./jats-parser-utils");
+const warn = (0, debug_1.default)('manuscripts-transform');
+const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
+const defaultTitle = 'Untitled Manuscript';
+exports.jatsFrontParser = {
+    parseTitles(element, createElement) {
+        var _a;
+        if (!element) {
+            return (0, transformer_1.buildTitles)(defaultTitle);
+        }
+        const title = element.querySelector('article-title');
+        const subtitle = element.querySelector('subtitle');
+        const runningTitle = element.querySelector('alt-title[alt-title-type="right-running"]');
+        const titles = (0, transformer_1.buildTitles)((_a = (0, jats_parser_utils_1.htmlFromJatsNode)(title, createElement)) !== null && _a !== void 0 ? _a : defaultTitle);
+        if (subtitle) {
+            titles.subtitle = (0, jats_parser_utils_1.htmlFromJatsNode)(subtitle, createElement);
+        }
+        if (runningTitle) {
+            titles.runningTitle = (0, jats_parser_utils_1.htmlFromJatsNode)(runningTitle, createElement);
+        }
+        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) {
+            const parseCount = (count) => {
+                if (count && /^-?\d+$/.test(count)) {
+                    return parseInt(count);
+                }
+                else if (count) {
+                    warn(`Invalid count number for ${count}`);
+                }
+            };
+            const genericCounts = [];
+            const countElements = counts.querySelectorAll('count');
+            for (const element of countElements.values()) {
+                const countType = element.getAttribute('count-type');
+                const count = parseCount(element.getAttribute('count'));
+                if (countType) {
+                    const genericCount = { count, countType };
+                    genericCounts.push(genericCount);
+                }
+            }
+            return {
+                wordCount: parseCount((_a = counts.querySelector('word-count')) === null || _a === void 0 ? void 0 : _a.getAttribute('count')),
+                figureCount: parseCount((_b = counts.querySelector('fig-count')) === null || _b === void 0 ? void 0 : _b.getAttribute('count')),
+                tableCount: parseCount((_c = counts.querySelector('table-count')) === null || _c === void 0 ? void 0 : _c.getAttribute('count')),
+                equationCount: parseCount((_d = counts.querySelector('equation-count')) === null || _d === void 0 ? void 0 : _d.getAttribute('count')),
+                referencesCount: parseCount((_e = counts.querySelector('ref-count')) === null || _e === void 0 ? void 0 : _e.getAttribute('count')),
+                genericCounts: genericCounts.length > 0 ? genericCounts : undefined,
+            };
+        }
+    },
+    parseJournal(element) {
+        const meta = (0, jats_journal_meta_parser_1.parseJournalMeta)(element);
+        return Object.assign(Object.assign({}, meta), (0, transformer_1.buildJournal)());
+    },
+    parseDates(historyNode) {
+        if (!historyNode) {
+            return undefined;
+        }
+        const history = {};
+        const dateToTimestamp = (dateElement) => {
+            const selectors = ['year', 'month', 'day'];
+            const values = [];
+            for (const selector of selectors) {
+                const value = (0, utils_1.getTrimmedTextContent)(dateElement, selector);
+                if (!value || isNaN(+value)) {
+                    return;
+                }
+                values.push(+value);
+            }
+            return Date.UTC(values[0], values[1], values[2]) / 1000;
+        };
+        for (const date of historyNode.children) {
+            const dateType = date.getAttribute('date-type');
+            switch (dateType) {
+                case 'received': {
+                    history.receiveDate = dateToTimestamp(date);
+                    break;
+                }
+                case 'rev-recd': {
+                    history.revisionReceiveDate = dateToTimestamp(date);
+                    break;
+                }
+                case 'accepted': {
+                    history.acceptanceDate = dateToTimestamp(date);
+                    break;
+                }
+                case 'rev-request': {
+                    history.revisionRequestDate = dateToTimestamp(date);
+                    break;
+                }
+                case 'retracted': {
+                    history.retractionDate = dateToTimestamp(date);
+                    break;
+                }
+                case 'corrected': {
+                    history.correctionDate = dateToTimestamp(date);
+                    break;
+                }
+            }
+        }
+        return history;
+    },
+    parseAffiliations(elements) {
+        const affiliationIDs = new Map();
+        const affiliations = elements.map((element, priority) => {
+            var _a, _b;
+            const affiliation = (0, transformer_1.buildAffiliation)('', priority);
+            for (const node of element.querySelectorAll('institution')) {
+                const content = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+                if (!content) {
+                    continue;
+                }
+                const type = node.getAttribute('content-type');
+                if (type === 'dept') {
+                    affiliation.department = content;
+                }
+                else {
+                    affiliation.institution = content;
+                }
+            }
+            affiliation.addressLine1 =
+                (0, utils_1.getTrimmedTextContent)(element, 'addr-line:nth-of-type(1)') || undefined;
+            affiliation.addressLine2 =
+                (0, utils_1.getTrimmedTextContent)(element, 'addr-line:nth-of-type(2)') || undefined;
+            affiliation.addressLine3 =
+                (0, utils_1.getTrimmedTextContent)(element, 'addr-line:nth-of-type(3)') || undefined;
+            affiliation.postCode =
+                (0, utils_1.getTrimmedTextContent)(element, 'postal-code') || undefined;
+            affiliation.country =
+                (0, utils_1.getTrimmedTextContent)(element, 'country') || undefined;
+            const email = element.querySelector('email');
+            if (email) {
+                affiliation.email = {
+                    href: email.getAttributeNS(XLINK_NAMESPACE, 'href') || undefined,
+                    text: ((_b = email.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+                };
+            }
+            const id = element.getAttribute('id');
+            if (id) {
+                affiliationIDs.set(id, affiliation._id);
+            }
+            return affiliation;
+        });
+        return {
+            affiliations,
+            affiliationIDs,
+        };
+    },
+    parseAuthorNotes(element) {
+        if (!element) {
+            return {
+                footnotes: [],
+                footnoteIDs: new Map(),
+                authorNotes: [],
+                authorNotesParagraphs: [],
+                correspondingIDs: new Map(),
+                correspondingList: [],
+            };
+        }
+        const { footnotes, footnoteIDs } = this.parseFootnotes([
+            ...element.querySelectorAll('fn:not([fn-type])'),
+        ]);
+        const authorNotesParagraphs = this.parseParagraphs([
+            ...element.querySelectorAll(':scope > p'),
+        ]);
+        const { correspondingList, correspondingIDs } = this.parseCorresp([
+            ...element.querySelectorAll('corresp'),
+        ]);
+        const authorNotes = [
+            (0, transformer_1.buildAuthorNotes)([
+                ...correspondingIDs.values(),
+                ...footnoteIDs.values(),
+                ...authorNotesParagraphs.map((p) => p._id),
+            ]),
+        ];
+        return {
+            footnotes,
+            footnoteIDs,
+            authorNotesParagraphs,
+            authorNotes,
+            correspondingIDs,
+            correspondingList,
+        };
+    },
+    parseParagraphs(elements) {
+        return elements.map((p) => (0, transformer_1.buildParagraph)(p.innerHTML));
+    },
+    parseFootnotes(elements) {
+        const footnoteIDs = new Map();
+        const footnotes = elements.map((element) => {
+            const fn = (0, transformer_1.buildFootnote)('', element.innerHTML);
+            const id = element.getAttribute('id');
+            if (id) {
+                footnoteIDs.set(id, fn._id);
+            }
+            return fn;
+        });
+        return {
+            footnotes,
+            footnoteIDs,
+        };
+    },
+    parseCorresp(elements) {
+        const correspondingIDs = new Map();
+        const correspondingList = elements.map((element) => {
+            var _a, _b, _c;
+            const label = element.querySelector('label');
+            if (label) {
+                label.remove();
+            }
+            const corresponding = (0, transformer_1.buildCorresp)((_b = (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '');
+            corresponding.label = ((_c = label === null || label === void 0 ? void 0 : label.textContent) === null || _c === void 0 ? void 0 : _c.trim()) || undefined;
+            const id = element.getAttribute('id');
+            if (id) {
+                correspondingIDs.set(id, corresponding._id);
+            }
+            return corresponding;
+        });
+        return {
+            correspondingList,
+            correspondingIDs,
+        };
+    },
+    parseContributors(elements, affiliationIDs, footnoteIDs, correspondingIDs) {
+        return elements.map((element, priority) => {
+            var _a, _b;
+            const name = (0, transformer_1.buildBibliographicName)({});
+            const given = (0, utils_1.getTrimmedTextContent)(element, 'name > given-names');
+            if (given) {
+                name.given = given;
+            }
+            const surname = (0, utils_1.getTrimmedTextContent)(element, 'name > surname');
+            if (surname) {
+                name.family = surname;
+            }
+            const contributor = (0, transformer_1.buildContributor)(name, 'author', priority);
+            const corresponding = element.getAttribute('corresp') === 'yes';
+            if (corresponding) {
+                contributor.isCorresponding = corresponding;
+            }
+            const orcid = (0, utils_1.getTrimmedTextContent)(element, 'contrib-id[contrib-id-type="orcid"]');
+            if (orcid) {
+                contributor.ORCIDIdentifier = orcid;
+            }
+            const xrefs = element.querySelectorAll('xref');
+            for (const xref of xrefs) {
+                if (xref) {
+                    const rid = xref.getAttribute('rid');
+                    const type = xref.getAttribute('ref-type');
+                    if (rid) {
+                        if (type === 'fn') {
+                            contributor.footnote = [];
+                            const footnoteID = footnoteIDs.get(rid);
+                            if (footnoteID) {
+                                const authorFootNoteRef = {
+                                    noteID: footnoteID,
+                                    noteLabel: ((_a = xref.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || '',
+                                };
+                                contributor.footnote.push(authorFootNoteRef);
+                            }
+                        }
+                        else if (type === 'corresp') {
+                            contributor.corresp = [];
+                            const correspID = correspondingIDs.get(rid);
+                            if (correspID) {
+                                const authorCorrespRef = {
+                                    correspID: correspID,
+                                    correspLabel: ((_b = xref.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '',
+                                };
+                                contributor.corresp.push(authorCorrespRef);
+                            }
+                        }
+                        else if (type === 'aff') {
+                            const rids = rid
+                                .split(/\s+/)
+                                .map((id) => affiliationIDs.get(id))
+                                .filter(Boolean);
+                            if (rids.length) {
+                                contributor.affiliations = rids;
+                            }
+                        }
+                    }
+                }
+            }
+            return contributor;
+        });
+    },
+};

package/dist/cjs/jats/importer/jats-journal-meta-parser.js

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJournal = exports.parseJournalMeta = exports.parseJournalISSNs = exports.parseJournalAbbreviatedTitles = exports.parseJournalIdentifiers = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
+exports.parseJournalMeta = exports.parseJournalISSNs = exports.parseJournalAbbreviatedTitles = exports.parseJournalIdentifiers = void 0;
 const utils_1 = require("../../lib/utils");
-const transformer_1 = require("../../transformer");
 const parseJournalIdentifiers = (element) => {
     var _a;
     if (!element) {
@@ -93,8 +91,3 @@ const parseJournalMeta = (element) => {
     };
 };
 exports.parseJournalMeta = parseJournalMeta;
-const parseJournal = (element) => {
-    const meta = (0, exports.parseJournalMeta)(element);
-    return Object.assign(Object.assign({}, meta), { _id: (0, transformer_1.generateID)(json_schema_1.ObjectTypes.Journal), objectType: json_schema_1.ObjectTypes.Journal });
-};
-exports.parseJournal = parseJournal;

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

@@ -21,35 +21,21 @@ const schema_1 = require("../../schema");
 const transformer_1 = require("../../transformer");
 const updateDocumentIDs = (node, replacements) => {
     const warnings = [];
-    const highlightNodes = [];
-    recurseDoc(node, (n, parent) => updateNodeID(n, parent, replacements, warnings, highlightNodes));
+    recurseDoc(node, (n) => updateNodeID(n, replacements, warnings));
     recurseDoc(node, (n) => updateNodeRID(n, replacements, warnings));
     recurseDoc(node, (n) => updateNodeRIDS(n, replacements, warnings));
-    recurseDoc(node, (n) => updateContributorNodesIDS(n, replacements, warnings));
     return warnings;
 };
 exports.updateDocumentIDs = updateDocumentIDs;
-function recurseDoc(node, fn, parent = null) {
-    fn(node, parent);
-    node.descendants((n, pos, parent) => fn(n, parent));
+function recurseDoc(node, fn) {
+    fn(node);
+    node.descendants((n) => fn(n));
 }
-const updateNodeID = (node, parent, replacements, warnings, highlightNodes) => {
+const updateNodeID = (node, replacements, warnings) => {
     if (node.type === schema_1.schema.nodes.inline_equation) {
         node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${(0, uuid_1.v4)()}` });
         return;
     }
-    if (node.type === schema_1.schema.nodes.highlight_marker) {
-        node.attrs = Object.assign(Object.assign({}, node.attrs), { tid: parent === null || parent === void 0 ? void 0 : parent.attrs.id });
-        highlightNodes.push(node);
-        return;
-    }
-    if (node.type === schema_1.schema.nodes.comment) {
-        const highlightNode = highlightNodes.find((n) => n.attrs.id === node.attrs.id);
-        if (highlightNode) {
-            node.attrs = Object.assign(Object.assign({}, node.attrs), { target: highlightNode.attrs.tid });
-        }
-        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;
@@ -92,30 +78,6 @@ const updateNodeRIDS = (node, replacements, warnings) => {
     }
     node.attrs = Object.assign(Object.assign({}, node.attrs), { rids: previousRIDs.map((r) => replacements.get(r) || r) });
 };
-const updateContributorNodesIDS = (node, replacements, warnings) => {
-    var _a, _b;
-    if (node.type === schema_1.schema.nodes.contributor) {
-        const footnote = (_a = node.attrs.footnote) === null || _a === void 0 ? void 0 : _a.map((fn) => {
-            return replacements.get(fn.noteID)
-                ? Object.assign(Object.assign({}, fn), { noteID: replacements.get(fn.noteID) }) : undefined;
-        }).filter(Boolean);
-        const corresp = (_b = node.attrs.corresp) === null || _b === void 0 ? void 0 : _b.map((corresp) => {
-            return replacements.get(corresp.correspID)
-                ? Object.assign(Object.assign({}, corresp), { correspID: replacements.get(corresp.correspID) }) : undefined;
-        }).filter(Boolean);
-        const affiliations = node.attrs.affiliations
-            .map((affiliation) => {
-            return replacements.get(affiliation);
-        })
-            .filter(Boolean);
-        node.attrs = Object.assign(Object.assign({}, node.attrs), { footnote,
-            corresp,
-            affiliations });
-    }
-    if (node.type !== schema_1.schema.nodes.contributors) {
-        return false;
-    }
-};
 const JATS_TO_HTML_MAPPING = new Map([
     ['bold', 'b'],
     ['italic', 'i'],

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

@@ -16,9 +16,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jatsReferenceParser = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
 const utils_1 = require("../../lib/utils");
-const transformer_1 = require("../../transformer");
+const builders_1 = require("../../transformer/builders");
+const jats_comments_1 = require("./jats-comments");
 const jats_parser_utils_1 = require("./jats-parser-utils");
 const jats_references_1 = require("./jats-references");
 const chooseBibliographyItemType = (publicationType) => {
@@ -40,15 +40,23 @@ exports.jatsReferenceParser = {
             const authorNodes = [
                 ...element.querySelectorAll('person-group[person-group-type="author"] > *'),
             ];
-            const bibliographyItem = {
-                id: (0, transformer_1.generateID)(json_schema_1.ObjectTypes.BibliographyItem),
+            const bibliographyItem = (0, builders_1.buildBibliographyItem)({
                 type: chooseBibliographyItemType(publicationType),
-            };
+            });
             const titleNode = element.querySelector('article-title');
             if (titleNode) {
                 bibliographyItem.title = (_a = (0, jats_parser_utils_1.htmlFromJatsNode)(titleNode, createElement)) === null || _a === void 0 ? void 0 : _a.trim();
             }
+            const comments = [];
             const mixedCitation = element.querySelector('mixed-citation');
+            mixedCitation === null || mixedCitation === void 0 ? void 0 : mixedCitation.childNodes.forEach((item) => {
+                if ((0, jats_comments_1.isJATSComment)(item)) {
+                    const comment = (0, jats_comments_1.parseJATSComment)(item);
+                    if (comment) {
+                        comments.push(comment);
+                    }
+                }
+            });
             if (authorNodes.length <= 0) {
                 mixedCitation === null || mixedCitation === void 0 ? void 0 : mixedCitation.childNodes.forEach((item) => {
                     var _a, _b, _c;
@@ -61,7 +69,7 @@ exports.jatsReferenceParser = {
             }
             const source = (0, utils_1.getTrimmedTextContent)(element, 'source');
             if (source) {
-                bibliographyItem.containerTitle = source;
+                bibliographyItem['container-title'] = source;
             }
             const volume = (0, utils_1.getTrimmedTextContent)(element, 'volume');
             if (volume) {
@@ -82,23 +90,18 @@ exports.jatsReferenceParser = {
             }
             const year = (0, utils_1.getTrimmedTextContent)(element, 'year');
             if (year) {
-                bibliographyItem.issued = {
+                bibliographyItem.issued = (0, builders_1.buildBibliographicDate)({
                     'date-parts': [[year]],
-                    _id: (0, transformer_1.generateID)(json_schema_1.ObjectTypes.BibliographicDate),
-                    objectType: json_schema_1.ObjectTypes.BibliographicDate,
-                };
+                });
             }
             const doi = (0, utils_1.getTrimmedTextContent)(element, 'pub-id[pub-id-type="doi"]');
             if (doi) {
-                bibliographyItem.doi = doi;
+                bibliographyItem.DOI = doi;
             }
             const authors = [];
             authorNodes.forEach((authorNode) => {
                 var _a;
-                const name = {
-                    _id: (0, transformer_1.generateID)(json_schema_1.ObjectTypes.BibliographicName),
-                    objectType: json_schema_1.ObjectTypes.BibliographicName,
-                };
+                const name = (0, builders_1.buildBibliographicName)({});
                 const given = (0, utils_1.getTrimmedTextContent)(authorNode, 'given-names');
                 if (given) {
                     name.given = given;
@@ -107,6 +110,10 @@ exports.jatsReferenceParser = {
                 if (family) {
                     name.family = family;
                 }
+                const suffix = (0, utils_1.getTrimmedTextContent)(authorNode, 'suffix');
+                if (suffix) {
+                    name.suffix = suffix;
+                }
                 if (authorNode.nodeName === 'collab') {
                     name.literal = (_a = authorNode.textContent) === null || _a === void 0 ? void 0 : _a.trim();
                 }
@@ -116,7 +123,7 @@ exports.jatsReferenceParser = {
                 bibliographyItem.author = authors;
             }
             const id = element.getAttribute('id');
-            references.add(bibliographyItem, id);
+            references.add(bibliographyItem, id, comments);
         });
         return references;
     },