@manuscripts/transform 2.6.0 → 2.6.1-LEAN-3966.1

package/dist/es/jats/{jats-versions.js → exporter/jats-versions.js}

@@ -27,7 +27,6 @@ const versions = {
         systemId: 'http://jats.nlm.nih.gov/archiving/1.2/JATS-archive-oasis-article1-mathml3.dtd',
     },
 };
-export const supportedVersions = () => Object.keys(versions);
 export const selectVersionIds = (version) => {
     if (!(version in versions)) {
         throw new Error(`Unknown version ${version}`);

package/dist/es/{transformer → jats/exporter}/labels.js

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { schema } from '../schema';
-import { nodeNames } from './node-names';
+import { schema, } from '../../schema';
+import { nodeNames } from '../../transformer/node-names';
 const labelledNodeTypes = [
     schema.nodes.figure_element,
     schema.nodes.table_element,
@@ -26,7 +26,7 @@ const excludedTypes = [schema.nodes.graphical_abstract_section];
 const chooseLabel = (nodeType) => {
     return nodeNames.get(nodeType);
 };
-export const buildTargets = (fragment) => {
+export const buildTargets = (node) => {
     const counters = {};
     for (const nodeType of labelledNodeTypes) {
         counters[nodeType.name] = {
@@ -40,7 +40,7 @@ export const buildTargets = (fragment) => {
         return `${counter.label} ${counter.index}`;
     };
     const targets = new Map();
-    fragment.descendants((node, pos, parent) => {
+    node.descendants((node, pos, parent) => {
         var _a;
         if (node.type.name in counters) {
             if (parent && excludedTypes.includes(parent.type)) {

package/dist/{cjs/transformer/model-map.js → es/jats/importer/create-article-node.js}

@@ -1,6 +1,5 @@
-"use strict";
 /*!
- * © 2020 Atypon Systems LLC
+ * © 2024 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.
@@ -14,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addModelToMap = void 0;
-const id_1 = require("./id");
-const addModelToMap = (modelMap) => (data) => {
-    if (!data._id) {
-        data._id = (0, id_1.generateID)(data.objectType);
+import { defaultTitle } from '../../lib/deafults';
+import { schema } from '../../schema';
+export const createArticleNode = (attrs) => {
+    const title = schema.nodes.title.createChecked({}, schema.text(defaultTitle));
+    if (!attrs.id) {
+        throw new Error('Manuscript ID is missing');
     }
-    modelMap.set(data._id, data);
+    return schema.nodes.manuscript.createAndFill(attrs, title);
 };
-exports.addModelToMap = addModelToMap;

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

@@ -13,43 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { v4 as uuidv4 } from 'uuid';
-import { buildComment, buildContribution, highlightableFields, isHighlightableModel, isKeyword, } from '../../transformer';
-const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
-export const isJATSComment = (node) => {
+import { schema } from '../../schema';
+import { generateNodeID } from '../../transformer';
+export const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
+const isJATSComment = (node) => {
     return (node.nodeType === node.PROCESSING_INSTRUCTION_NODE &&
         node.nodeName === 'AuthorQuery');
 };
-export const parseJATSComment = (node) => {
+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],
-            };
-        }
+        return (queryText && queryText[1]) || undefined;
     }
 };
 export const markComments = (doc) => {
-    const marks = [];
+    var _a;
     const root = doc.getRootNode();
     const queue = [root];
+    const commentsElement = doc.createElement('comments');
     while (queue.length !== 0) {
         const node = queue.shift();
         if (node) {
             if (isJATSComment(node)) {
-                const comment = parseJATSComment(node);
-                if (comment) {
-                    const token = addMark(doc, node);
-                    if (token) {
-                        const mark = {
-                            token,
-                            comment,
-                        };
-                        marks.push(mark);
+                const text = parseJATSComment(node);
+                if (text) {
+                    const id = generateNodeID(schema.nodes.comment);
+                    const parent = node.parentNode;
+                    if (parent) {
+                        const marker = createHighlightMarkerElement(doc, id);
+                        parent.insertBefore(marker, node);
+                        const targetID = (_a = parent.closest('[id]')) === null || _a === void 0 ? void 0 : _a.id;
+                        const commentElement = createCommentElement(doc, id, targetID, text);
+                        commentsElement.appendChild(commentElement);
                     }
                 }
             }
@@ -58,93 +54,22 @@ export const markComments = (doc) => {
             });
         }
     }
-    return marks;
-};
-const addMark = (doc, node) => {
-    const parent = node.parentElement;
-    if (parent) {
-        const token = uuidv4();
-        const tokenNode = doc.createTextNode(token);
-        parent.insertBefore(tokenNode, node);
-        return token;
-    }
-};
-export const createComments = (models, marks) => {
-    const comments = [];
-    for (const model of models) {
-        if (isHighlightableModel(model)) {
-            comments.push(...processModel(model, marks));
-        }
-        else if (isKeyword(model)) {
-            comments.push(...processKeyword(model, marks));
-        }
+    if (commentsElement.hasChildNodes()) {
+        doc.documentElement.appendChild(commentsElement);
     }
-    return comments;
 };
-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 createHighlightMarkerElement = (doc, id) => {
+    const highlightMarker = doc.createElement('highlight-marker');
+    highlightMarker.setAttribute('id', id);
+    highlightMarker.setAttribute('position', 'point');
+    return highlightMarker;
 };
-const processModel = (model, marks) => {
-    const comments = [];
-    for (const field of 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 = [buildContribution(DEFAULT_PROFILE_ID)];
-        const comment = 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 = [buildContribution(DEFAULT_PROFILE_ID)];
-        const selector = {
-            from: index,
-            to: index,
-        };
-        const comment = buildComment(model._id, mark.comment.text, selector, contributions);
-        comments.push(comment);
-    }
-    return {
-        content: result,
-        comments,
-    };
-};
-export const createReferenceComments = (references) => {
-    const comments = [];
-    for (const item of references.getBibliographyItems()) {
-        const id = item._id;
-        for (const comment of references.getComments(id)) {
-            const contributions = [buildContribution(DEFAULT_PROFILE_ID)];
-            const c = buildComment(id, comment.text, undefined, contributions);
-            comments.push(c);
-        }
+const createCommentElement = (doc, id, targetID, text) => {
+    const commentElement = doc.createElement('comment');
+    commentElement.setAttribute('id', id);
+    if (targetID) {
+        commentElement.setAttribute('target-id', targetID);
     }
-    return comments;
+    commentElement.textContent = text;
+    return commentElement;
 };

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

@@ -13,10 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { buildBibliographicDate, buildBibliographicName, buildContribution, ObjectTypes, } from '@manuscripts/json-schema';
 import mime from 'mime';
 import { DOMParser, Fragment } from 'prosemirror-model';
-import { schema } from '../../schema';
+import { getTrimmedTextContent } from '../../lib/utils';
+import { schema, } from '../../schema';
 import { chooseSectionCategory } from '../../transformer';
+import { DEFAULT_PROFILE_ID } from './jats-comments';
+import { htmlFromJatsNode } from './jats-parser-utils';
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
 const chooseContentType = (graphicNode) => {
     if (graphicNode) {
@@ -31,6 +35,12 @@ const chooseContentType = (graphicNode) => {
         }
     }
 };
+const parsePriority = (priority) => {
+    if (!priority) {
+        return undefined;
+    }
+    return parseInt(priority);
+};
 const getEquationContent = (p) => {
     var _a;
     const element = p;
@@ -53,6 +63,129 @@ const getEquationContent = (p) => {
     }
     return { id, format, contents };
 };
+const getEmail = (element) => {
+    var _a, _b, _c;
+    const email = element.querySelector('email');
+    if (email) {
+        return {
+            href: (_a = email.getAttributeNS(XLINK_NAMESPACE, 'href')) !== null && _a !== void 0 ? _a : '',
+            text: (_c = (_b = email.textContent) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : '',
+        };
+    }
+};
+const getInstitutionDetails = (element) => {
+    var _a;
+    let department = '';
+    let 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 type = node.getAttribute('content-type');
+        if (type === 'dept') {
+            department = content;
+        }
+        else {
+            institution = content;
+        }
+    }
+    return { department, institution };
+};
+const getAddressLine = (element, index) => {
+    return getTrimmedTextContent(element, `addr-line:nth-of-type(${index})`) || '';
+};
+const getHTMLContent = (node, querySelector) => {
+    return htmlFromJatsNode(node.querySelector(querySelector));
+};
+const chooseBibliographyItemType = (publicationType) => {
+    switch (publicationType) {
+        case 'book':
+        case 'thesis':
+            return publicationType;
+        case 'journal':
+        default:
+            return 'article-journal';
+    }
+};
+const parseRef = (element) => {
+    const publicationType = element.getAttribute('publication-type');
+    const authorNodes = [
+        ...element.querySelectorAll('person-group[person-group-type="author"] > *'),
+    ];
+    const id = element.id;
+    const attrs = {
+        id,
+        type: chooseBibliographyItemType(publicationType),
+    };
+    const title = getHTMLContent(element, 'article-title');
+    if (title) {
+        attrs.title = title;
+    }
+    const mixedCitation = element.querySelector('mixed-citation');
+    if (authorNodes.length <= 0) {
+        mixedCitation === null || mixedCitation === void 0 ? void 0 : mixedCitation.childNodes.forEach((item) => {
+            var _a, _b, _c;
+            if (item.nodeType === Node.TEXT_NODE &&
+                ((_a = item.textContent) === null || _a === void 0 ? void 0 : _a.match(/[A-Za-z]+/g))) {
+                attrs.literal = (_c = (_b = mixedCitation.textContent) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : '';
+                return attrs;
+            }
+        });
+    }
+    const source = getHTMLContent(element, 'source');
+    if (source) {
+        attrs.containerTitle = source;
+    }
+    const volume = getTrimmedTextContent(element, 'volume');
+    if (volume) {
+        attrs.volume = volume;
+    }
+    const issue = getTrimmedTextContent(element, 'issue');
+    if (issue) {
+        attrs.issue = issue;
+    }
+    const supplement = getTrimmedTextContent(element, 'supplement');
+    if (supplement) {
+        attrs.supplement = supplement;
+    }
+    const fpage = getTrimmedTextContent(element, 'fpage');
+    const lpage = getTrimmedTextContent(element, 'lpage');
+    if (fpage) {
+        attrs.page = lpage ? `${fpage}-${lpage}` : fpage;
+    }
+    const year = getTrimmedTextContent(element, 'year');
+    if (year) {
+        attrs.issued = buildBibliographicDate({
+            'date-parts': [[year]],
+        });
+    }
+    const doi = getTrimmedTextContent(element, 'pub-id[pub-id-type="doi"]');
+    if (doi) {
+        attrs.doi = doi;
+    }
+    const authors = [];
+    authorNodes.forEach((authorNode) => {
+        var _a;
+        const name = buildBibliographicName({});
+        const given = getTrimmedTextContent(authorNode, 'given-names');
+        if (given) {
+            name.given = given;
+        }
+        const family = getTrimmedTextContent(authorNode, 'surname');
+        if (family) {
+            name.family = family;
+        }
+        if (authorNode.nodeName === 'collab') {
+            name.literal = (_a = authorNode.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+        }
+        authors.push(name);
+    });
+    if (authors.length) {
+        attrs.author = authors;
+    }
+    return attrs;
+};
 const marks = [
     {
         tag: 'bold',
@@ -95,6 +228,202 @@ const marks = [
     },
 ];
 const nodes = [
+    {
+        tag: 'article',
+        node: 'manuscript',
+        getAttrs: (node) => {
+            var _a, _b;
+            const element = node;
+            const doi = element.querySelector('front > article-meta > article-id[pub-id-type="doi"]');
+            return {
+                doi: doi === null || doi === void 0 ? void 0 : doi.textContent,
+                articleType: (_a = element.getAttribute('article-type')) !== null && _a !== void 0 ? _a : '',
+                primaryLanguageCode: (_b = element.getAttribute('lang')) !== null && _b !== void 0 ? _b : '',
+            };
+        },
+    },
+    {
+        tag: 'article-title',
+        node: 'title',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+            };
+        },
+    },
+    {
+        tag: 'highlight-marker',
+        node: 'highlight_marker',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.id,
+                position: element.getAttribute('position'),
+            };
+        },
+    },
+    {
+        tag: 'comment',
+        node: 'comment',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                target: element.getAttribute('target-id'),
+                contents: element.textContent,
+                contributions: [buildContribution(DEFAULT_PROFILE_ID)],
+            };
+        },
+    },
+    {
+        tag: 'author-notes',
+        node: 'author_notes',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+            };
+        },
+    },
+    {
+        tag: 'funding-group',
+        node: 'awards',
+    },
+    {
+        tag: 'award-group',
+        node: 'award',
+        getAttrs: (node) => {
+            var _a, _b;
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                recipient: (_a = element.querySelector('principal-award-recipient')) === null || _a === void 0 ? void 0 : _a.textContent,
+                code: Array.from(element.querySelectorAll('award-id'))
+                    .map((awardID) => awardID.textContent)
+                    .reduce((acc, text) => (acc ? `${acc};${text}` : text), ''),
+                source: (_b = element.querySelector('funding-source')) === null || _b === void 0 ? void 0 : _b.textContent,
+            };
+        },
+    },
+    {
+        tag: 'fn:not([fn-type])',
+        node: 'footnote',
+        context: 'author_notes/',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                kind: 'footnote',
+            };
+        },
+    },
+    {
+        tag: 'corresp',
+        node: 'corresp',
+        getAttrs: (node) => {
+            var _a;
+            const element = node;
+            const label = element.querySelector('label');
+            if (label) {
+                label.remove();
+            }
+            return {
+                id: element.getAttribute('id'),
+                label: (_a = label === null || label === void 0 ? void 0 : label.textContent) === null || _a === void 0 ? void 0 : _a.trim(),
+            };
+        },
+        getContent: (node) => {
+            var _a;
+            const element = node;
+            return Fragment.from(schema.text(((_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || ''));
+        },
+    },
+    {
+        tag: 'contrib[contrib-type="author"]',
+        node: 'contributor',
+        getAttrs: (node) => {
+            var _a, _b;
+            const element = node;
+            const footnote = [];
+            const affiliations = [];
+            const corresp = [];
+            const xrefs = element.querySelectorAll('xref');
+            for (const xref of xrefs) {
+                const rid = xref.getAttribute('rid');
+                const type = xref.getAttribute('ref-type');
+                if (!rid) {
+                    continue;
+                }
+                switch (type) {
+                    case 'fn':
+                        footnote.push({
+                            noteID: rid,
+                            noteLabel: ((_a = xref.textContent) === null || _a === void 0 ? void 0 : _a.trim()) || '',
+                        });
+                        break;
+                    case 'corresp':
+                        corresp.push({
+                            correspID: rid,
+                            correspLabel: ((_b = xref.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '',
+                        });
+                        break;
+                    case 'aff':
+                        affiliations.push(rid);
+                        break;
+                }
+            }
+            return {
+                id: element.getAttribute('id'),
+                role: 'author',
+                affiliations,
+                corresp,
+                footnote,
+                isCorresponding: element.getAttribute('corresp')
+                    ? element.getAttribute('corresp') === 'yes'
+                    : undefined,
+                bibliographicName: {
+                    given: getTrimmedTextContent(element, 'name > given-names'),
+                    family: getTrimmedTextContent(element, 'name > surname'),
+                    ObjectType: ObjectTypes.BibliographicName,
+                },
+                ORCIDIdentifier: getTrimmedTextContent(element, 'contrib-id[contrib-id-type="orcid"]'),
+                priority: parsePriority(element.getAttribute('priority')),
+            };
+        },
+        getContent: () => {
+            return Fragment.from(schema.text('_'));
+        },
+    },
+    {
+        tag: 'affiliations',
+        node: 'affiliations',
+    },
+    {
+        tag: 'aff',
+        node: 'affiliation',
+        context: 'affiliations/',
+        getAttrs: (node) => {
+            var _a, _b;
+            const element = node;
+            const { department, institution } = getInstitutionDetails(element);
+            return {
+                id: element.getAttribute('id'),
+                institution: institution !== null && institution !== void 0 ? institution : '',
+                department: department !== null && department !== void 0 ? department : '',
+                addressLine1: getAddressLine(element, 1),
+                addressLine2: getAddressLine(element, 2),
+                addressLine3: getAddressLine(element, 3),
+                postCode: (_a = getTrimmedTextContent(element, 'postal-code')) !== null && _a !== void 0 ? _a : '',
+                country: (_b = getTrimmedTextContent(element, 'country')) !== null && _b !== void 0 ? _b : '',
+                email: getEmail(element),
+                priority: parsePriority(element.getAttribute('priority')),
+            };
+        },
+        getContent: () => {
+            return Fragment.from(schema.text('_'));
+        },
+    },
     {
         tag: 'attrib',
         node: 'attribution',
@@ -103,10 +432,6 @@ const nodes = [
         tag: 'back',
         ignore: true,
     },
-    {
-        tag: 'body',
-        node: 'manuscript',
-    },
     {
         tag: 'break',
         node: 'hard_break',
@@ -126,13 +451,13 @@ const nodes = [
             const title = element.querySelector('title');
             if (title) {
                 const captionTitle = schema.nodes.caption_title.create();
-                content.push(jatsBodyDOMParser.parse(title, { topNode: captionTitle }));
+                content.push(jatsDOMParser.parse(title, { topNode: captionTitle }));
             }
             const paragraphs = element.querySelectorAll('p');
             if (paragraphs.length) {
                 const figcaption = schema.nodes.caption.create();
                 for (const paragraph of paragraphs) {
-                    content.push(jatsBodyDOMParser.parse(paragraph, { topNode: figcaption }));
+                    content.push(jatsDOMParser.parse(paragraph, { topNode: figcaption }));
                 }
             }
             return Fragment.from(content);
@@ -334,7 +659,7 @@ const nodes = [
             const paragraphs = [];
             node.childNodes.forEach((p) => {
                 const paragraph = schema.nodes.paragraph.create();
-                const content = jatsBodyDOMParser.parse(p, {
+                const content = jatsDOMParser.parse(p, {
                     topNode: paragraph,
                 });
                 paragraphs.push(content);
@@ -445,6 +770,21 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'sec[sec-type="bibliography"]',
+        node: 'bibliography_section',
+    },
+    {
+        tag: 'ref-list',
+        context: 'bibliography_section/',
+        node: 'bibliography_element',
+    },
+    {
+        tag: 'ref',
+        context: 'bibliography_element/',
+        node: 'bibliography_item',
+        getAttrs: (node) => parseRef(node),
+    },
     {
         tag: 'sec',
         node: 'section',
@@ -524,7 +864,7 @@ const nodes = [
     {
         tag: 'title',
         node: 'section_title',
-        context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/',
+        context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/|author_notes/',
     },
     {
         tag: 'title',
@@ -606,4 +946,4 @@ const nodes = [
         },
     },
 ];
-export const jatsBodyDOMParser = new DOMParser(schema, [...marks, ...nodes]);
+export const jatsDOMParser = new DOMParser(schema, [...marks, ...nodes]);

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ObjectTypes } from '@manuscripts/json-schema';
 import { getTrimmedTextContent } from '../../lib/utils';
 export const parseJournalIdentifiers = (element) => {
     var _a;
@@ -84,3 +85,11 @@ export const parseJournalMeta = (element) => {
         title: (_b = getTrimmedTextContent(element, 'journal-title-group > journal-title')) !== null && _b !== void 0 ? _b : undefined,
     };
 };
+export const parseJournal = (doc) => {
+    const journalMeta = doc.querySelector('journal-meta');
+    if (!journalMeta) {
+        return;
+    }
+    const meta = parseJournalMeta(journalMeta);
+    return Object.assign(Object.assign({}, meta), { objectType: ObjectTypes.Journal });
+};