@manuscripts/transform 1.5.8 → 2.0.0

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

@@ -15,140 +15,142 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReferenceComments = exports.createComments = exports.markProcessingInstructions = exports.parseProcessingInstruction = void 0;
+exports.createReferenceComments = exports.createComments = exports.markComments = exports.parseJATSComment = exports.isJATSComment = void 0;
 const uuid_1 = require("uuid");
 const transformer_1 = require("../../transformer");
-const DEFAULT_ANNOTATION_COLOR = 'rgb(250, 224, 150)';
 const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
-const parseProcessingInstruction = (node) => {
-    var _a;
-    const value = `<AuthorQuery ${(_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim()} />`;
-    const processingInstruction = new DOMParser().parseFromString(value, 'application/xml').firstElementChild;
-    if (processingInstruction) {
-        const queryText = processingInstruction.getAttribute('queryText');
-        const id = processingInstruction.getAttribute('id');
-        if (queryText && id) {
-            return { queryText, id };
+const isJATSComment = (node) => {
+    return (node.nodeType === node.PROCESSING_INSTRUCTION_NODE &&
+        node.nodeName === 'AuthorQuery');
+};
+exports.isJATSComment = isJATSComment;
+const parseJATSComment = (node) => {
+    const text = node.textContent;
+    if (text) {
+        const id = /id="(.+)"/.exec(text);
+        const queryText = /queryText="(.+)"/.exec(text);
+        if (id && queryText) {
+            return {
+                id: id[1],
+                text: queryText[1],
+            };
         }
     }
 };
-exports.parseProcessingInstruction = parseProcessingInstruction;
-const markProcessingInstructions = (doc) => {
-    const authorQueriesMap = new Map();
+exports.parseJATSComment = parseJATSComment;
+const markComments = (doc) => {
+    const marks = [];
     const root = doc.getRootNode();
     const queue = [root];
     while (queue.length !== 0) {
         const node = queue.shift();
         if (node) {
-            const { nodeType, nodeName } = node;
-            if (nodeType === node.PROCESSING_INSTRUCTION_NODE &&
-                nodeName === 'AuthorQuery') {
-                insertToken(doc, node, authorQueriesMap);
+            if ((0, exports.isJATSComment)(node)) {
+                const comment = (0, exports.parseJATSComment)(node);
+                if (comment) {
+                    const token = addMark(doc, node);
+                    if (token) {
+                        const mark = {
+                            token,
+                            comment,
+                        };
+                        marks.push(mark);
+                    }
+                }
             }
             node.childNodes.forEach((child) => {
                 queue.push(child);
             });
         }
     }
-    return authorQueriesMap;
+    return marks;
 };
-exports.markProcessingInstructions = markProcessingInstructions;
-const insertToken = (doc, processingInstructionNode, authorQueriesMap) => {
-    const instruction = (0, exports.parseProcessingInstruction)(processingInstructionNode);
-    const { parentElement } = processingInstructionNode;
-    if (parentElement && instruction) {
-        const { queryText } = instruction;
+exports.markComments = markComments;
+const addMark = (doc, node) => {
+    const parent = node.parentElement;
+    if (parent) {
         const token = (0, uuid_1.v4)();
         const tokenNode = doc.createTextNode(token);
-        authorQueriesMap.set(token, queryText);
-        return parentElement.insertBefore(tokenNode, processingInstructionNode);
-    }
-};
-const extractCommentsFromKeywords = (tokens, model, authorQueriesMap) => {
-    var _a;
-    const commentAnnotations = [];
-    const name = model.name;
-    const filteredTokens = filterAndSortTokens(tokens, name);
-    let content = name;
-    for (const token of filteredTokens) {
-        content = name.replace(token, '');
-        const query = authorQueriesMap.get(token);
-        const commentAnnotation = (0, transformer_1.buildComment)((_a = model.containedGroup) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(), `${query}`, undefined, [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)], DEFAULT_ANNOTATION_COLOR);
-        model['name'] = content;
-        commentAnnotations.push(commentAnnotation);
+        parent.insertBefore(tokenNode, node);
+        return token;
     }
-    return commentAnnotations;
 };
-const createComments = (authorQueriesMap, manuscriptModels) => {
-    const tokens = [...authorQueriesMap.keys()];
-    const commentAnnotations = [];
-    for (const model of manuscriptModels) {
+const createComments = (models, marks) => {
+    const comments = [];
+    for (const model of models) {
         if ((0, transformer_1.isHighlightableModel)(model)) {
-            const comments = addCommentsFromMarkedProcessingInstructions(tokens, model, authorQueriesMap);
-            commentAnnotations.push(...comments);
+            comments.push(...processModel(model, marks));
         }
         else if ((0, transformer_1.isKeyword)(model)) {
-            const comments = extractCommentsFromKeywords(tokens, model, authorQueriesMap);
-            commentAnnotations.push(...comments);
+            comments.push(...processKeyword(model, marks));
         }
     }
-    return commentAnnotations;
+    return comments;
 };
 exports.createComments = createComments;
-function filterAndSortTokens(tokens, content) {
-    return tokens
-        .filter((token) => content.indexOf(token) >= 0)
-        .sort((a, b) => content.indexOf(a) - content.indexOf(b));
-}
-const addCommentsFromMarkedProcessingInstructions = (tokens, model, authorQueriesMap) => {
-    const commentAnnotations = [];
-    for (const field of ['contents', 'caption', 'title']) {
-        const highlightableField = field;
-        const content = model[highlightableField];
+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 sortedTokens = tokens
-            .filter((token) => content.indexOf(token) >= 0)
-            .sort((a, b) => content.indexOf(a) - content.indexOf(b));
-        let contentWithoutTokens = content;
-        for (const token of sortedTokens) {
-            const query = authorQueriesMap.get(token);
-            if (query) {
-                const trimmedTextContent = contentWithoutTokens
-                    ? contentWithoutTokens.replace(/^\s+/gm, '')
-                    : undefined;
-                const startTokenIndex = trimmedTextContent
-                    ? trimmedTextContent.indexOf(token)
-                    : undefined;
-                contentWithoutTokens = contentWithoutTokens.replace(token, '');
-                const comment = `${query}`;
-                const target = model._id && !(0, transformer_1.isCommentAnnotation)(model) ? model._id : (0, uuid_1.v4)();
-                const contributions = [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)];
-                const selector = startTokenIndex
-                    ? { from: startTokenIndex, to: startTokenIndex }
-                    : undefined;
-                const commentAnnotation = (0, transformer_1.buildComment)(target, comment, selector, contributions, DEFAULT_ANNOTATION_COLOR);
-                commentAnnotations.push(commentAnnotation);
-            }
+        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;
         }
-        model[highlightableField] = contentWithoutTokens;
+        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 commentAnnotations;
+    return comments;
 };
-const createReferenceComments = (referenceQueriesMap, references) => {
+const processContent = (model, content, marks) => {
     const comments = [];
-    for (const reference of references) {
-        const id = reference._id;
-        if (referenceQueriesMap.has(id)) {
-            for (const comment of referenceQueriesMap.get(id) || []) {
-                const target = reference._id && !(0, transformer_1.isCommentAnnotation)(reference)
-                    ? reference._id
-                    : (0, uuid_1.v4)();
-                const contributions = [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)];
-                const commentAnnotation = (0, transformer_1.buildComment)(target, comment, undefined, contributions, DEFAULT_ANNOTATION_COLOR);
-                comments.push(commentAnnotation);
-            }
+    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;

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

@@ -23,9 +23,28 @@ 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;
+    },
     parseCounts(counts) {
         var _a, _b, _c, _d, _e;
         if (counts) {
@@ -42,7 +61,7 @@ exports.jatsFrontParser = {
             for (const element of countElements.values()) {
                 const countType = element.getAttribute('count-type');
                 const count = parseCount(element.getAttribute('count'));
-                if (countType && typeof count === 'number') {
+                if (countType) {
                     const genericCount = { count, countType };
                     genericCounts.push(genericCount);
                 }
@@ -57,17 +76,9 @@ exports.jatsFrontParser = {
             };
         }
     },
-    parseJournal(journalMeta) {
-        if (!journalMeta) {
-            return {
-                journalIdentifiers: [],
-                abbreviatedTitles: [],
-                ISSNs: [],
-                publisherName: undefined,
-                title: undefined,
-            };
-        }
-        return (0, jats_journal_meta_parser_1.parseJournalMeta)(journalMeta);
+    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) {
@@ -117,66 +128,61 @@ exports.jatsFrontParser = {
         }
         return history;
     },
-    parseSupplements(supplementNodes) {
+    parseSupplements(elements) {
         var _a, _b, _c, _d;
-        if (!supplementNodes || supplementNodes.length === 0) {
+        if (!(elements === null || elements === void 0 ? void 0 : elements.length)) {
             return [];
         }
         const supplements = [];
-        for (const supplementNode of supplementNodes) {
-            const supplTitle = (_a = (0, utils_1.getTrimmedTextContent)(supplementNode, 'caption > title')) !== null && _a !== void 0 ? _a : '';
-            const href = (_b = supplementNode.getAttributeNS(XLINK_NAMESPACE, 'href')) !== null && _b !== void 0 ? _b : '';
-            const supplementaryMaterial = (0, transformer_1.buildSupplementaryMaterial)(supplTitle, href);
-            const mimeType = (_c = supplementNode.getAttribute('mimetype')) !== null && _c !== void 0 ? _c : '';
-            const mimeSubtype = (_d = supplementNode.getAttribute('mime-subtype')) !== null && _d !== void 0 ? _d : '';
+        for (const element of elements) {
+            const title = (_a = (0, utils_1.getTrimmedTextContent)(element, 'caption > title')) !== null && _a !== void 0 ? _a : '';
+            const href = (_b = element.getAttributeNS(XLINK_NAMESPACE, 'href')) !== null && _b !== void 0 ? _b : '';
+            const supplement = (0, transformer_1.buildSupplementaryMaterial)(title, href);
+            const mimeType = (_c = element.getAttribute('mimetype')) !== null && _c !== void 0 ? _c : '';
+            const mimeSubtype = (_d = element.getAttribute('mime-subtype')) !== null && _d !== void 0 ? _d : '';
             if (mimeType && mimeSubtype) {
-                supplementaryMaterial.MIME = [mimeType, mimeSubtype].join('/');
+                supplement.MIME = [mimeType, mimeSubtype].join('/');
             }
-            supplements.push(supplementaryMaterial);
+            supplements.push(supplement);
         }
         return supplements;
     },
-    parseAffiliationNodes(affiliationNodes) {
+    parseAffiliations(elements) {
         const affiliationIDs = new Map();
-        const affiliations = affiliationNodes.map((affiliationNode, priority) => {
+        const affiliations = elements.map((element, priority) => {
             var _a, _b;
             const affiliation = (0, transformer_1.buildAffiliation)('', priority);
-            for (const node of affiliationNode.querySelectorAll('institution')) {
+            for (const node of element.querySelectorAll('institution')) {
                 const content = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.trim();
                 if (!content) {
                     continue;
                 }
-                const contentType = node.getAttribute('content-type');
-                switch (contentType) {
-                    case null:
-                        affiliation.institution = content;
-                        break;
-                    case 'dept':
-                        affiliation.department = content;
-                        break;
+                const type = node.getAttribute('content-type');
+                if (type === 'dept') {
+                    affiliation.department = content;
+                }
+                else {
+                    affiliation.institution = content;
                 }
             }
             affiliation.addressLine1 =
-                (0, utils_1.getTrimmedTextContent)(affiliationNode, 'addr-line:nth-of-type(1)') ||
-                    undefined;
+                (0, utils_1.getTrimmedTextContent)(element, 'addr-line:nth-of-type(1)') || undefined;
             affiliation.addressLine2 =
-                (0, utils_1.getTrimmedTextContent)(affiliationNode, 'addr-line:nth-of-type(2)') ||
-                    undefined;
+                (0, utils_1.getTrimmedTextContent)(element, 'addr-line:nth-of-type(2)') || undefined;
             affiliation.addressLine3 =
-                (0, utils_1.getTrimmedTextContent)(affiliationNode, 'addr-line:nth-of-type(3)') ||
-                    undefined;
-            const emailNode = affiliationNode.querySelector('email');
-            if (emailNode) {
+                (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: emailNode.getAttributeNS(XLINK_NAMESPACE, 'href') || undefined,
-                    text: ((_b = emailNode.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
+                    href: email.getAttributeNS(XLINK_NAMESPACE, 'href') || undefined,
+                    text: ((_b = email.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || undefined,
                 };
             }
-            affiliation.postCode =
-                (0, utils_1.getTrimmedTextContent)(affiliationNode, 'postal-code') || undefined;
-            affiliation.country =
-                (0, utils_1.getTrimmedTextContent)(affiliationNode, 'country') || undefined;
-            const id = affiliationNode.getAttribute('id');
+            const id = element.getAttribute('id');
             if (id) {
                 affiliationIDs.set(id, affiliation._id);
             }
@@ -187,11 +193,11 @@ exports.jatsFrontParser = {
             affiliationIDs,
         };
     },
-    parseFootnoteNodes(footnoteNodes) {
+    parseAuthorNotes(elements) {
         const footnoteIDs = new Map();
-        const footnotes = footnoteNodes.map((footnoteNode) => {
-            const fn = (0, transformer_1.buildFootnote)('', footnoteNode.innerHTML);
-            const id = footnoteNode.getAttribute('id');
+        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);
             }
@@ -202,17 +208,17 @@ exports.jatsFrontParser = {
             footnoteIDs,
         };
     },
-    parseCorrespNodes(correspNodes) {
+    parseCorresp(elements) {
         const correspondingIDs = new Map();
-        const correspondingList = correspNodes.map((correspNode) => {
+        const correspondingList = elements.map((element) => {
             var _a, _b, _c;
-            const label = correspNode.querySelector('label');
+            const label = element.querySelector('label');
             if (label) {
                 label.remove();
             }
-            const corresponding = (0, transformer_1.buildCorresp)((_b = (_a = correspNode.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '');
+            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 = correspNode.getAttribute('id');
+            const id = element.getAttribute('id');
             if (id) {
                 correspondingIDs.set(id, corresponding._id);
             }
@@ -223,60 +229,60 @@ exports.jatsFrontParser = {
             correspondingIDs,
         };
     },
-    parseAuthorNodes(authorNodes, affiliationIDs, footnoteIDs, correspondingIDs) {
-        return authorNodes.map((authorNode, priority) => {
+    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)(authorNode, 'name > given-names');
+            const given = (0, utils_1.getTrimmedTextContent)(element, 'name > given-names');
             if (given) {
                 name.given = given;
             }
-            const surname = (0, utils_1.getTrimmedTextContent)(authorNode, 'name > surname');
+            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 = authorNode.getAttribute('corresp') === 'yes';
+            const corresponding = element.getAttribute('corresp') === 'yes';
             if (corresponding) {
                 contributor.isCorresponding = corresponding;
             }
-            const orcid = (0, utils_1.getTrimmedTextContent)(authorNode, 'contrib-id[contrib-id-type="orcid"]');
+            const orcid = (0, utils_1.getTrimmedTextContent)(element, 'contrib-id[contrib-id-type="orcid"]');
             if (orcid) {
                 contributor.ORCIDIdentifier = orcid;
             }
-            const xrefNodes = authorNode.querySelectorAll('xref');
-            for (const xrefNode of xrefNodes) {
-                if (xrefNode) {
-                    const rid = xrefNode.getAttribute('rid');
-                    const rtype = xrefNode.getAttribute('ref-type');
+            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 (rtype === 'fn') {
+                        if (type === 'fn') {
                             contributor.footnote = [];
-                            const footnoteId = footnoteIDs.get(rid);
-                            if (footnoteId) {
+                            const footnoteID = footnoteIDs.get(rid);
+                            if (footnoteID) {
                                 const authorFootNoteRef = {
-                                    noteID: footnoteId,
-                                    noteLabel: ((_a = xrefNode.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || '',
+                                    noteID: footnoteID,
+                                    noteLabel: ((_a = xref.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || '',
                                 };
                                 contributor.footnote.push(authorFootNoteRef);
                             }
                         }
-                        else if (rtype === 'corresp') {
+                        else if (type === 'corresp') {
                             contributor.corresp = [];
-                            const correspId = correspondingIDs.get(rid);
-                            if (correspId) {
+                            const correspID = correspondingIDs.get(rid);
+                            if (correspID) {
                                 const authorCorrespRef = {
-                                    correspID: correspId,
-                                    correspLabel: ((_b = xrefNode.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '',
+                                    correspID: correspID,
+                                    correspLabel: ((_b = xref.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '',
                                 };
                                 contributor.corresp.push(authorCorrespRef);
                             }
                         }
-                        else if (rtype === 'aff') {
+                        else if (type === 'aff') {
                             const rids = rid
                                 .split(/\s+/)
-                                .filter((id) => affiliationIDs.has(id))
-                                .map((id) => affiliationIDs.get(id));
+                                .map((id) => affiliationIDs.get(id))
+                                .filter(Boolean);
                             if (rids.length) {
                                 contributor.affiliations = rids;
                             }

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

@@ -17,65 +17,77 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJournalMeta = exports.parseJournalISSNs = exports.parseJournalAbbreviatedTitles = exports.parseJournalIdentifiers = void 0;
 const utils_1 = require("../../lib/utils");
-const parseJournalIdentifiers = (journalMeta) => {
-    var _a, _b;
+const parseJournalIdentifiers = (element) => {
+    var _a;
+    if (!element) {
+        return [];
+    }
     const output = [];
-    const elements = journalMeta.querySelectorAll('journal-id');
-    for (const element of elements) {
-        const journalIDType = element.getAttribute('journal-id-type');
-        const journalID = (_b = (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : element.textContent;
-        if (journalID !== null && journalIDType != null) {
-            output.push({ journalIDType, journalID });
-        }
-        else if (journalID !== null) {
-            output.push({ journalID });
+    const ids = element.querySelectorAll('journal-id');
+    for (const id of ids) {
+        const type = id.getAttribute('journal-id-type');
+        const value = (_a = id.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!value) {
+            continue;
         }
+        output.push({
+            journalID: value,
+            journalIDType: type !== null && type !== void 0 ? type : undefined,
+        });
     }
     return output;
 };
 exports.parseJournalIdentifiers = parseJournalIdentifiers;
-const parseJournalAbbreviatedTitles = (journalMeta) => {
-    var _a, _b;
+const parseJournalAbbreviatedTitles = (element) => {
+    var _a;
+    if (!element) {
+        return [];
+    }
     const output = [];
-    const elements = journalMeta.querySelectorAll('journal-title-group > abbrev-journal-title');
-    for (const element of elements) {
-        const abbrevType = element.getAttribute('abbrev-type');
-        const abbreviatedTitle = (_b = (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : element.textContent;
-        if (abbreviatedTitle !== null && abbrevType !== null) {
-            output.push({ abbreviatedTitle, abbrevType });
-        }
-        else if (abbreviatedTitle !== null) {
-            output.push({ abbreviatedTitle });
+    const titles = element.querySelectorAll('journal-title-group > abbrev-journal-title');
+    for (const title of titles) {
+        const type = title.getAttribute('abbrev-type');
+        const value = (_a = title.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!value) {
+            continue;
         }
+        output.push({
+            abbreviatedTitle: value,
+            abbrevType: type !== null && type !== void 0 ? type : undefined,
+        });
     }
     return output;
 };
 exports.parseJournalAbbreviatedTitles = parseJournalAbbreviatedTitles;
-const parseJournalISSNs = (journalMeta) => {
-    var _a, _b;
+const parseJournalISSNs = (element) => {
+    var _a;
+    if (!element) {
+        return [];
+    }
     const output = [];
-    const elements = journalMeta.querySelectorAll('issn');
-    for (const element of elements) {
-        const publicationType = element.getAttribute('pub-type');
-        const ISSN = (_b = (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : element.textContent;
-        if (publicationType !== null && ISSN !== null) {
-            output.push({ publicationType, ISSN });
-        }
-        else if (ISSN !== null) {
-            output.push({ ISSN });
+    const issns = element.querySelectorAll('issn');
+    for (const issn of issns) {
+        const type = issn.getAttribute('pub-type');
+        const value = (_a = issn.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!value) {
+            continue;
         }
+        output.push({
+            ISSN: value,
+            publicationType: type !== null && type !== void 0 ? type : undefined,
+        });
     }
     return output;
 };
 exports.parseJournalISSNs = parseJournalISSNs;
-const parseJournalMeta = (journalMeta) => {
+const parseJournalMeta = (element) => {
     var _a, _b;
     return {
-        abbreviatedTitles: (0, exports.parseJournalAbbreviatedTitles)(journalMeta),
-        journalIdentifiers: (0, exports.parseJournalIdentifiers)(journalMeta),
-        ISSNs: (0, exports.parseJournalISSNs)(journalMeta),
-        publisherName: (_a = (0, utils_1.getTrimmedTextContent)(journalMeta, 'publisher > publisher-name')) !== null && _a !== void 0 ? _a : undefined,
-        title: (_b = (0, utils_1.getTrimmedTextContent)(journalMeta, 'journal-title-group > journal-title')) !== null && _b !== void 0 ? _b : undefined,
+        abbreviatedTitles: (0, exports.parseJournalAbbreviatedTitles)(element),
+        journalIdentifiers: (0, exports.parseJournalIdentifiers)(element),
+        ISSNs: (0, exports.parseJournalISSNs)(element),
+        publisherName: (_a = (0, utils_1.getTrimmedTextContent)(element, 'publisher > publisher-name')) !== null && _a !== void 0 ? _a : undefined,
+        title: (_b = (0, utils_1.getTrimmedTextContent)(element, 'journal-title-group > journal-title')) !== null && _b !== void 0 ? _b : undefined,
     };
 };
 exports.parseJournalMeta = parseJournalMeta;