@manuscripts/transform 2.6.0 → 2.6.1-LEAN-3966.1

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

@@ -13,48 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getModelsByType, ObjectTypes, } from '@manuscripts/json-schema';
+import { ObjectTypes, } from '@manuscripts/json-schema';
 import { CitationProvider } from '@manuscripts/library';
 import debug from 'debug';
 import { DOMParser as ProsemirrorDOMParser, DOMSerializer, } from 'prosemirror-model';
+import { findChildrenByAttr, findChildrenByType } from 'prosemirror-utils';
 import serializeToXML from 'w3c-xmlserializer';
-import { nodeFromHTML, textFromHTML } from '../lib/html';
-import { normalizeStyleName } from '../lib/styled-content';
-import { iterateChildren } from '../lib/utils';
-import { isCitationNode, schema, } from '../schema';
-import { generateAttachmentFilename } from '../transformer/filename';
-import { buildTargets } from '../transformer/labels';
-import { isExecutableNodeType, isNodeType } from '../transformer/node-types';
-import { hasObjectType } from '../transformer/object-types';
-import { findManuscript, findManuscriptById, findTitles, } from '../transformer/project-bundle';
-import { chooseJatsFnType, chooseSecType, } from '../transformer/section-category';
+import { nodeFromHTML, textFromHTML } from '../../lib/html';
+import { isCitationNode, schema, } from '../../schema';
+import { chooseJatsFnType, chooseSecType, isExecutableNodeType, isNodeType, } from '../../transformer';
 import { selectVersionIds } from './jats-versions';
+import { buildTargets } from './labels';
 const warn = debug('manuscripts-transform');
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
 const normalizeID = (id) => id.replace(/:/g, '_');
 const parser = ProsemirrorDOMParser.fromSchema(schema);
-const findChildNodeOfType = (node, nodeType) => {
-    for (const child of iterateChildren(node)) {
-        if (child.type === nodeType) {
-            return child;
-        }
-    }
-};
-const isContributor = hasObjectType(ObjectTypes.Contributor);
-const CREDIT_VOCAB_IDENTIFIER = 'https://dictionary.casrai.org/Contributor_Roles';
-const chooseRoleVocabAttributes = (role) => {
-    if (role.uri && role.uri.startsWith(CREDIT_VOCAB_IDENTIFIER)) {
-        return {
-            vocab: 'credit',
-            'vocab-identifier': CREDIT_VOCAB_IDENTIFIER,
-            'vocab-term': role.name,
-            'vocab-term-identifier': role.uri,
-        };
-    }
-    return {
-        vocab: 'uncontrolled',
-    };
-};
 const insertAbstractNode = (articleMeta, abstractNode) => {
     const siblings = [
         'kwd-group',
@@ -91,24 +64,24 @@ const createDefaultIdGenerator = () => {
         return `${element.localName}-${value}`;
     };
 };
-const chooseRefType = (objectType) => {
-    switch (objectType) {
-        case ObjectTypes.Figure:
-        case ObjectTypes.FigureElement:
+const chooseRefType = (type) => {
+    switch (type) {
+        case schema.nodes.figure:
+        case schema.nodes.figure_element:
             return 'fig';
-        case ObjectTypes.Footnote:
+        case schema.nodes.footnote:
             return 'fn';
-        case ObjectTypes.Table:
-        case ObjectTypes.TableElement:
+        case schema.nodes.table:
+        case schema.nodes.table_element:
             return 'table';
-        case ObjectTypes.Section:
+        case schema.nodes.section:
             return 'sec';
-        case ObjectTypes.Equation:
-        case ObjectTypes.EquationElement:
+        case schema.nodes.equation:
+        case schema.nodes.equation_element:
             return 'disp-formula';
     }
 };
-const sortContributors = (a, b) => Number(a.priority) - Number(b.priority);
+const sortContributors = (a, b) => Number(a.attrs.priority) - Number(b.attrs.priority);
 export const buildCitations = (citations) => citations.map((citation) => ({
     citationID: citation.attrs.id,
     citationItems: citation.attrs.rids.map((rid) => ({
@@ -120,39 +93,58 @@ export const buildCitations = (citations) => citations.map((citation) => ({
 }));
 export class JATSExporter {
     constructor() {
-        this.serializeToJATS = async (fragment, modelMap, manuscriptID, options) => {
-            const { version = '1.2', doi, id, frontMatterOnly = false, links, idGenerator, mediaPathGenerator, csl, } = options;
-            this.modelMap = modelMap;
-            this.models = Array.from(this.modelMap.values());
-            this.generateCitationTexts(fragment, csl);
+        this.getLibraryItem = (manuscriptID) => {
+            return (id) => {
+                var _a;
+                const node = (_a = findChildrenByAttr(this.manuscriptNode, (attrs) => attrs.id === id)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                if (!node) {
+                    return undefined;
+                }
+                return {
+                    _id: node.attrs.id,
+                    issued: node.attrs.issued,
+                    DOI: node.attrs.doi,
+                    manuscriptID,
+                    objectType: ObjectTypes.BibliographyItem,
+                    author: node.attrs.author,
+                    'container-title': node.attrs.containerTitle,
+                    volume: node.attrs.volume,
+                    issue: node.attrs.issue,
+                    supplement: node.attrs.supplement,
+                    page: node.attrs.page,
+                    title: node.attrs.title,
+                    literal: node.attrs.literal,
+                    type: node.attrs.type,
+                };
+            };
+        };
+        this.serializeToJATS = async (manuscriptNode, options) => {
+            var _a;
+            this.manuscriptNode = manuscriptNode;
+            this.generateCitationTexts(options.csl, manuscriptNode.attrs.id);
             this.createSerializer();
-            const versionIds = selectVersionIds(version);
+            const versionIds = selectVersionIds((_a = options.version) !== null && _a !== void 0 ? _a : '1.2');
             this.document = document.implementation.createDocument(null, 'article', document.implementation.createDocumentType('article', versionIds.publicId, versionIds.systemId));
             const article = this.document.documentElement;
             article.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xlink', XLINK_NAMESPACE);
-            const front = this.buildFront(doi, id, links);
+            const front = this.buildFront(options.journal);
             article.appendChild(front);
-            const manuscript = findManuscriptById(this.modelMap, manuscriptID);
-            article.setAttribute('article-type', manuscript.articleType || 'other');
-            if (!frontMatterOnly) {
-                this.labelTargets = buildTargets(fragment);
-                const body = this.buildBody(fragment);
-                article.appendChild(body);
-                const back = this.buildBack(body);
-                this.moveCoiStatementToAuthorNotes(back, front);
-                article.appendChild(back);
-                this.unwrapBody(body);
-                this.moveAbstracts(front, body);
-                this.moveFloatsGroup(body, article);
-                this.removeBackContainer(body);
-                this.updateFootnoteTypes(front, back);
-                this.fillEmptyTableFooters(article);
-                this.fillEmptyFootnotes(article);
-            }
-            await this.rewriteIDs(idGenerator);
-            if (mediaPathGenerator) {
-                await this.rewriteMediaPaths(mediaPathGenerator);
-            }
+            article.setAttribute('article-type', manuscriptNode.attrs.articleType || 'other');
+            this.labelTargets = buildTargets(manuscriptNode);
+            const body = this.buildBody();
+            article.appendChild(body);
+            const back = this.buildBack(body);
+            this.moveCoiStatementToAuthorNotes(back, front);
+            article.appendChild(back);
+            this.unwrapBody(body);
+            this.moveAbstracts(front, body);
+            this.moveFloatsGroup(body, article);
+            this.removeBackContainer(body);
+            this.updateFootnoteTypes(front, back);
+            this.fillEmptyTableFooters(article);
+            this.fillEmptyFootnotes(article);
+            this.moveAwards(front, body);
+            await this.rewriteIDs();
             return serializeToXML(this.document);
         };
         this.nodeFromJATS = (JATSFragment) => {
@@ -165,19 +157,6 @@ export class JATSExporter {
             template.innerHTML = JATSFragment;
             return template.firstChild;
         };
-        this.rewriteMediaPaths = async (generator) => {
-            const doc = this.document;
-            for (const fig of doc.querySelectorAll('fig')) {
-                for (const graphic of fig.querySelectorAll('graphic')) {
-                    const newHref = await generator(graphic, fig.id);
-                    graphic.setAttributeNS(XLINK_NAMESPACE, 'href', newHref);
-                }
-            }
-            for (const suppl of doc.querySelectorAll('supplementary-material')) {
-                const newHref = await generator(suppl, suppl.id);
-                suppl.setAttributeNS(XLINK_NAMESPACE, 'href', newHref);
-            }
-        };
         this.rewriteIDs = async (generator = createDefaultIdGenerator()) => {
             const ids = new Map();
             for (const element of this.document.querySelectorAll('[id]')) {
@@ -219,16 +198,14 @@ export class JATSExporter {
                 }
             }
         };
-        this.buildFront = (doi, id, links) => {
-            var _a, _b, _c, _d, _e;
-            const manuscript = findManuscript(this.modelMap);
-            const titles = findTitles(this.modelMap);
+        this.buildFront = (journal) => {
+            var _a;
+            const titleNode = (_a = findChildrenByType(this.manuscriptNode, schema.nodes.title)[0]) === null || _a === void 0 ? void 0 : _a.node;
             const front = this.document.createElement('front');
             const journalMeta = this.document.createElement('journal-meta');
             front.appendChild(journalMeta);
             const articleMeta = this.document.createElement('article-meta');
             front.appendChild(articleMeta);
-            const journal = [...this.modelMap.values()].find((model) => model.objectType === ObjectTypes.Journal);
             if (journal) {
                 if (journal.journalIdentifiers) {
                     for (const item of journal.journalIdentifiers) {
@@ -277,109 +254,47 @@ export class JATSExporter {
                     journalMeta.appendChild(publisher);
                 }
             }
-            if (id) {
-                const articleID = this.document.createElement('article-id');
-                articleID.setAttribute('pub-id-type', 'publisher-id');
-                articleID.textContent = id;
-                articleMeta.appendChild(articleID);
-            }
-            if (doi || manuscript.DOI) {
+            if (this.manuscriptNode.attrs.doi) {
                 const articleID = this.document.createElement('article-id');
                 articleID.setAttribute('pub-id-type', 'doi');
-                articleID.textContent = (_a = manuscript.DOI) !== null && _a !== void 0 ? _a : doi;
+                articleID.textContent = this.manuscriptNode.attrs.doi;
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
             articleMeta.appendChild(titleGroup);
             this.buildContributors(articleMeta);
-            if (links && links.self) {
-                for (const [key, value] of Object.entries(links.self)) {
-                    const link = this.document.createElement('self-uri');
-                    link.setAttribute('content-type', key);
-                    link.setAttributeNS(XLINK_NAMESPACE, 'href', value);
-                    articleMeta.appendChild(link);
-                }
-            }
-            if (titles.title) {
+            if (titleNode) {
                 const element = this.document.createElement('article-title');
-                this.setTitleContent(element, titles.title);
-                titleGroup.appendChild(element);
-            }
-            if (titles.subtitle) {
-                const element = this.document.createElement('subtitle');
-                this.setTitleContent(element, titles.subtitle);
-                titleGroup.appendChild(element);
-            }
-            if (titles.runningTitle) {
-                const element = this.document.createElement('alt-title');
-                element.setAttribute('alt-title-type', 'right-running');
-                this.setTitleContent(element, titles.runningTitle);
+                this.setTitleContent(element, titleNode.textContent);
                 titleGroup.appendChild(element);
             }
-            const supplements = [...this.modelMap.values()].filter((model) => model.objectType === ObjectTypes.Supplement);
-            if (supplements && supplements.length > 0) {
-                for (const supplement of supplements) {
-                    const supplementaryMaterial = this.document.createElement('supplementary-material');
-                    supplementaryMaterial.setAttribute('id', normalizeID(supplement._id));
-                    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 = (_e = supplement.title) !== null && _e !== void 0 ? _e : '';
-                    caption.append(title);
-                    supplementaryMaterial.append(caption);
-                    articleMeta.append(supplementaryMaterial);
-                }
-            }
-            const history = articleMeta.querySelector('history') ||
-                this.document.createElement('history');
-            if (manuscript.acceptanceDate) {
-                const date = this.buildDateElement(manuscript.acceptanceDate, 'accepted');
-                history.appendChild(date);
-            }
-            if (manuscript.correctionDate) {
-                const date = this.buildDateElement(manuscript.correctionDate, 'corrected');
-                history.appendChild(date);
-            }
-            if (manuscript.retractionDate) {
-                const date = this.buildDateElement(manuscript.retractionDate, 'retracted');
-                history.appendChild(date);
-            }
-            if (manuscript.receiveDate) {
-                const date = this.buildDateElement(manuscript.receiveDate, 'received');
-                history.appendChild(date);
-            }
-            if (manuscript.revisionReceiveDate) {
-                const date = this.buildDateElement(manuscript.revisionReceiveDate, 'rev-recd');
-                history.appendChild(date);
-            }
-            if (manuscript.revisionRequestDate) {
-                const date = this.buildDateElement(manuscript.revisionRequestDate, 'rev-request');
-                history.appendChild(date);
-            }
-            if (history.childElementCount) {
-                articleMeta.appendChild(history);
-            }
+            const supplementsNodes = findChildrenByType(this.manuscriptNode, schema.nodes.supplement);
+            supplementsNodes.forEach(({ node }) => {
+                var _a, _b, _c, _d;
+                const supplementaryMaterial = this.document.createElement('supplementary-material');
+                supplementaryMaterial.setAttribute('id', normalizeID(node.attrs.id));
+                supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', (_a = node.attrs.href) !== null && _a !== void 0 ? _a : '');
+                supplementaryMaterial.setAttribute('mimetype', (_b = node.attrs.mimeType) !== null && _b !== void 0 ? _b : '');
+                supplementaryMaterial.setAttribute('mime-subtype', (_c = node.attrs.mimeSubType) !== null && _c !== void 0 ? _c : '');
+                const caption = this.document.createElement('caption');
+                const title = this.document.createElement('title');
+                title.textContent = (_d = node.attrs.title) !== null && _d !== void 0 ? _d : '';
+                caption.append(title);
+                supplementaryMaterial.append(caption);
+                articleMeta.append(supplementaryMaterial);
+            });
             this.buildKeywords(articleMeta);
             let countingElements = [];
-            if (manuscript.genericCounts) {
-                const elements = manuscript.genericCounts.map((el) => {
-                    const countingElement = this.buildCountingElement('count', el.count);
-                    if (countingElement) {
-                        countingElement.setAttribute('count-type', el.countType);
-                    }
-                    return countingElement;
-                });
-                countingElements.push(...elements);
-            }
-            countingElements.push(this.buildCountingElement('fig-count', manuscript.figureCount));
-            countingElements.push(this.buildCountingElement('table-count', manuscript.tableCount));
-            countingElements.push(this.buildCountingElement('equation-count', manuscript.equationCount));
-            countingElements.push(this.buildCountingElement('ref-count', manuscript.referencesCount));
-            countingElements.push(this.buildCountingElement('word-count', manuscript.wordCount));
+            const figureCount = findChildrenByType(this.manuscriptNode, schema.nodes.figure).length;
+            countingElements.push(this.buildCountingElement('fig-count', figureCount));
+            const equationCount = findChildrenByType(this.manuscriptNode, schema.nodes.equation_element).length;
+            countingElements.push(this.buildCountingElement('equation-count', equationCount));
+            const tableCount = findChildrenByType(this.manuscriptNode, schema.nodes.table).length;
+            countingElements.push(this.buildCountingElement('table-count', tableCount));
+            const referencesCount = findChildrenByType(this.manuscriptNode, schema.nodes.bibliography_item).length;
+            countingElements.push(this.buildCountingElement('ref-count', referencesCount));
+            const wordCount = this.manuscriptNode.textContent.split(/\s+/).length;
+            countingElements.push(this.buildCountingElement('word-count', wordCount));
             countingElements = countingElements.filter((el) => el);
             if (countingElements.length > 0) {
                 const counts = this.document.createElement('counts');
@@ -414,13 +329,13 @@ export class JATSExporter {
                 return wordCount;
             }
         };
-        this.buildBody = (fragment) => {
+        this.buildBody = () => {
             const body = this.document.createElement('body');
-            fragment.forEach((cFragment) => {
+            this.manuscriptNode.forEach((cFragment) => {
                 const serializedNode = this.serializeNode(cFragment);
                 body.append(...serializedNode.childNodes);
             });
-            this.fixBody(body, fragment);
+            this.fixBody(body);
             return body;
         };
         this.buildBack = (body) => {
@@ -446,11 +361,15 @@ export class JATSExporter {
                 refList = this.document.createElement('ref-list');
             }
             back.appendChild(refList);
+            const bibliographyItems = findChildrenByType(this.manuscriptNode, schema.nodes.bibliography_item).map((n) => n.node);
             const [meta] = this.citationProvider.makeBibliography();
-            for (const id of meta.entry_ids) {
-                const bibliographyItem = this.modelMap.get(id[0]);
+            for (const [id] of meta.entry_ids) {
+                const bibliographyItem = bibliographyItems.find((n) => n.attrs.id === id);
+                if (!bibliographyItem) {
+                    continue;
+                }
                 const ref = this.document.createElement('ref');
-                ref.setAttribute('id', normalizeID(id[0]));
+                ref.setAttribute('id', normalizeID(id));
                 const updateCitationPubType = (citationEl, pubType) => {
                     if (pubType) {
                         switch (pubType) {
@@ -467,21 +386,21 @@ export class JATSExporter {
                         citationEl.setAttribute('publication-type', 'journal');
                     }
                 };
-                if (bibliographyItem.literal) {
+                if (bibliographyItem.attrs.literal) {
                     const mixedCitation = this.document.createElement('mixed-citation');
-                    updateCitationPubType(mixedCitation, bibliographyItem.type);
-                    mixedCitation.textContent = bibliographyItem.literal;
+                    updateCitationPubType(mixedCitation, bibliographyItem.attrs.type);
+                    mixedCitation.textContent = bibliographyItem.attrs.literal;
                     ref.appendChild(mixedCitation);
                     refList.appendChild(ref);
                 }
                 else {
                     const citation = this.document.createElement('element-citation');
-                    updateCitationPubType(citation, bibliographyItem.type);
-                    if (bibliographyItem.author) {
+                    updateCitationPubType(citation, bibliographyItem.attrs.type);
+                    if (bibliographyItem.attrs.author) {
                         const personGroupNode = this.document.createElement('person-group');
                         personGroupNode.setAttribute('person-group-type', 'author');
                         citation.appendChild(personGroupNode);
-                        bibliographyItem.author.forEach((author) => {
+                        bibliographyItem.attrs.author.forEach((author) => {
                             const name = this.document.createElement('string-name');
                             if (author.family) {
                                 const node = this.document.createElement('surname');
@@ -503,8 +422,8 @@ export class JATSExporter {
                             }
                         });
                     }
-                    if (bibliographyItem.issued) {
-                        const dateParts = bibliographyItem.issued['date-parts'];
+                    if (bibliographyItem.attrs.issued) {
+                        const dateParts = bibliographyItem.attrs.issued['date-parts'];
                         if (dateParts && dateParts.length) {
                             const [[year, month, day]] = dateParts;
                             if (year) {
@@ -524,33 +443,33 @@ export class JATSExporter {
                             }
                         }
                     }
-                    if (bibliographyItem.title) {
+                    if (bibliographyItem.attrs.title) {
                         const node = this.document.createElement('article-title');
-                        this.setTitleContent(node, bibliographyItem.title);
+                        this.setTitleContent(node, bibliographyItem.attrs.title);
                         citation.appendChild(node);
                     }
-                    if (bibliographyItem['container-title']) {
+                    if (bibliographyItem.attrs.containerTitle) {
                         const node = this.document.createElement('source');
-                        node.textContent = bibliographyItem['container-title'];
+                        this.setTitleContent(node, bibliographyItem.attrs.containerTitle);
                         citation.appendChild(node);
                     }
-                    if (bibliographyItem.volume) {
+                    if (bibliographyItem.attrs.volume) {
                         const node = this.document.createElement('volume');
-                        node.textContent = String(bibliographyItem.volume);
+                        node.textContent = String(bibliographyItem.attrs.volume);
                         citation.appendChild(node);
                     }
-                    if (bibliographyItem.issue) {
+                    if (bibliographyItem.attrs.issue) {
                         const node = this.document.createElement('issue');
-                        node.textContent = String(bibliographyItem.issue);
+                        node.textContent = String(bibliographyItem.attrs.issue);
                         citation.appendChild(node);
                     }
-                    if (bibliographyItem.supplement) {
+                    if (bibliographyItem.attrs.supplement) {
                         const node = this.document.createElement('supplement');
-                        node.textContent = bibliographyItem.supplement;
+                        node.textContent = bibliographyItem.attrs.supplement;
                         citation.appendChild(node);
                     }
-                    if (bibliographyItem.page) {
-                        const pageString = String(bibliographyItem.page);
+                    if (bibliographyItem.attrs.page) {
+                        const pageString = String(bibliographyItem.attrs.page);
                         if (/^\d+$/.test(pageString)) {
                             const node = this.document.createElement('fpage');
                             node.textContent = pageString;
@@ -571,10 +490,10 @@ export class JATSExporter {
                             citation.appendChild(node);
                         }
                     }
-                    if (bibliographyItem.DOI) {
+                    if (bibliographyItem.attrs.doi) {
                         const node = this.document.createElement('pub-id');
                         node.setAttribute('pub-id-type', 'doi');
-                        node.textContent = String(bibliographyItem.DOI);
+                        node.textContent = String(bibliographyItem.attrs.doi);
                         citation.appendChild(node);
                     }
                     ref.appendChild(citation);
@@ -584,10 +503,19 @@ export class JATSExporter {
             return back;
         };
         this.createSerializer = () => {
-            const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                award: () => '',
-                awards: () => '',
+                awards: () => ['funding-group', 0],
+                award: (node) => {
+                    const awardGroup = node;
+                    const awardGroupElement = this.document.createElement('award-group');
+                    awardGroupElement.setAttribute('id', normalizeID(awardGroup.attrs.id));
+                    appendChildIfPresent(awardGroupElement, 'funding-source', awardGroup.attrs.source);
+                    awardGroup.attrs.code
+                        .split(';')
+                        .forEach((code) => appendChildIfPresent(awardGroupElement, 'award-id', code));
+                    appendChildIfPresent(awardGroupElement, 'principal-award-recipient', awardGroup.attrs.recipient);
+                    return awardGroupElement;
+                },
                 box_element: (node) => createBoxElement(node),
                 author_notes: () => '',
                 corresp: () => '',
@@ -609,11 +537,7 @@ export class JATSExporter {
                 backmatter: () => ['backmatter', 0],
                 supplement: () => '',
                 supplements: () => '',
-                bibliography_section: (node) => [
-                    'ref-list',
-                    { id: normalizeID(node.attrs.id) },
-                    0,
-                ],
+                bibliography_section: () => '',
                 blockquote_element: () => ['disp-quote', { 'content-type': 'quote' }, 0],
                 list: (node) => {
                     var _a;
@@ -649,24 +573,25 @@ export class JATSExporter {
                     return xref;
                 },
                 cross_reference: (node) => {
+                    var _a;
                     const cross = node;
                     const rids = cross.attrs.rids;
                     if (!rids.length) {
                         return cross.attrs.label;
                     }
                     const text = cross.attrs.customLabel || cross.attrs.label;
-                    const model = getModel(rids[0]);
-                    if (!model) {
+                    const target = (_a = findChildrenByAttr(this.manuscriptNode, (attrs) => attrs.id === rids[0])[0]) === null || _a === void 0 ? void 0 : _a.node;
+                    if (!target) {
                         warn('');
                         return text;
                     }
                     const xref = this.document.createElement('xref');
-                    const type = chooseRefType(model.objectType);
+                    const type = chooseRefType(target.type);
                     if (type) {
                         xref.setAttribute('ref-type', type);
                     }
                     else {
-                        warn(`Unset ref-type for objectType ${model.objectType}`);
+                        warn(`Unset ref-type for schema type ${target.type.name}`);
                     }
                     xref.setAttribute('rid', normalizeID(rids.join(' ')));
                     xref.textContent = text;
@@ -738,7 +663,10 @@ export class JATSExporter {
                 hard_break: () => '',
                 highlight_marker: () => '',
                 inline_footnote: (node) => {
-                    const rids = node.attrs.rids.filter(getModel);
+                    const rids = node.attrs.rids.filter((rid) => {
+                        var _a;
+                        return (_a = findChildrenByAttr(this.manuscriptNode, (attrs) => attrs.id === rid)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                    });
                     if (rids.length == 0) {
                         return '';
                     }
@@ -857,14 +785,7 @@ export class JATSExporter {
                 italic: () => ['italic'],
                 smallcaps: () => ['sc'],
                 strikethrough: () => ['strike'],
-                styled: (mark) => {
-                    const inlineStyle = getModel(mark.attrs.rid);
-                    const attrs = {};
-                    if (inlineStyle && inlineStyle.title) {
-                        attrs.style = normalizeStyleName(inlineStyle.title);
-                    }
-                    return ['styled-content', attrs];
-                },
+                styled: () => ['styled-content'],
                 superscript: () => ['sup'],
                 subscript: () => ['sub'],
                 underline: () => ['underline'],
@@ -872,6 +793,14 @@ export class JATSExporter {
                 tracked_delete: () => ['del'],
             };
             this.serializer = new DOMSerializer(nodes, marks);
+            const appendChildIfPresent = (parent, tagName, textContent) => {
+                if (!textContent) {
+                    return;
+                }
+                const element = this.document.createElement(tagName);
+                element.textContent = textContent;
+                parent.appendChild(element);
+            };
             const processChildNodes = (element, node, contentNodeType) => {
                 node.forEach((childNode) => {
                     if (childNode.type === contentNodeType) {
@@ -915,14 +844,16 @@ export class JATSExporter {
                 }
             };
             const appendChildNodeOfType = (element, node, type) => {
-                const childNode = findChildNodeOfType(node, type);
+                var _a;
+                const childNode = (_a = findChildrenByType(node, type)[0]) === null || _a === void 0 ? void 0 : _a.node;
                 if (childNode) {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
             const appendTable = (element, node) => {
-                const tableNode = findChildNodeOfType(node, node.type.schema.nodes.table);
-                const colGroupNode = findChildNodeOfType(node, node.type.schema.nodes.table_colgroup);
+                var _a, _b;
+                const tableNode = (_a = findChildrenByType(node, node.type.schema.nodes.table)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                const colGroupNode = (_b = findChildrenByType(node, node.type.schema.nodes.table_colgroup)[0]) === null || _b === void 0 ? void 0 : _b.node;
                 if (!tableNode) {
                     return;
                 }
@@ -975,7 +906,8 @@ export class JATSExporter {
                 return element;
             };
             const processExecutableNode = (node, element) => {
-                const listingNode = findChildNodeOfType(node, node.type.schema.nodes.listing);
+                var _a;
+                const listingNode = (_a = findChildrenByType(node, node.type.schema.nodes.listing)[0]) === null || _a === void 0 ? void 0 : _a.node;
                 if (listingNode) {
                     const { contents, languageKey } = listingNode.attrs;
                     if (contents && languageKey) {
@@ -987,47 +919,29 @@ export class JATSExporter {
                         code.setAttribute('language', languageKey);
                         code.textContent = contents;
                         listing.appendChild(code);
-                        const caption = this.document.createElement('caption');
-                        listing.appendChild(caption);
-                        const attachments = [];
-                        for (const attachment of attachments) {
-                            const p = this.document.createElement('p');
-                            caption.appendChild(p);
-                            const filename = generateAttachmentFilename(`${listingNode.attrs.id}:${attachment.id}`, attachment.type);
-                            const supp = this.document.createElement('supplementary-material');
-                            supp.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', `suppl/${filename}`);
-                            const [mimeType, mimeSubType] = attachment.type.split('/');
-                            if (mimeType) {
-                                supp.setAttribute('mimetype', mimeType);
-                                if (mimeSubType) {
-                                    supp.setAttribute('mime-subtype', mimeSubType);
-                                }
-                            }
-                            p.appendChild(supp);
-                        }
                     }
                 }
             };
         };
-        this.serializeFragment = (fragment) => this.serializer.serializeFragment(fragment, {
-            document: this.document,
-        });
         this.serializeNode = (node) => this.serializer.serializeNode(node, {
             document: this.document,
         });
         this.validateContributor = (contributor) => {
-            if (!contributor.bibliographicName) {
-                throw new Error(`${contributor._id} has no bibliographicName`);
+            if (!contributor.attrs.bibliographicName) {
+                throw new Error(`${contributor.attrs.id} has no bibliographicName`);
             }
-            const { family, given } = contributor.bibliographicName;
+            const { family, given } = contributor.attrs.bibliographicName;
             if (!family && !given) {
-                throw new Error(`${contributor._id} has neither family nor given name`);
+                throw new Error(`${contributor.attrs.id} has neither family nor given name`);
             }
         };
         this.buildContributors = (articleMeta) => {
-            const contributors = this.models.filter(isContributor);
-            const authorContributors = contributors
-                .filter((contributor) => contributor.role === 'author')
+            const contributorNodes = findChildrenByType(this.manuscriptNode, schema.nodes.contributor).map((result) => result.node);
+            const authorContributorNodes = contributorNodes
+                .filter((n) => n.attrs.role === 'author')
+                .sort(sortContributors);
+            const otherContributorsNodes = contributorNodes
+                .filter((n) => n.attrs.role !== 'author')
                 .sort(sortContributors);
             const affiliationLabels = new Map();
             const creatAffiliationLabel = (rid) => {
@@ -1045,11 +959,11 @@ export class JATSExporter {
                 sup.textContent = String(content);
                 return sup;
             };
-            if (authorContributors.length) {
+            if (authorContributorNodes.length) {
                 const contribGroup = this.document.createElement('contrib-group');
                 contribGroup.setAttribute('content-type', 'authors');
                 articleMeta.appendChild(contribGroup);
-                authorContributors.forEach((contributor) => {
+                authorContributorNodes.forEach((contributor) => {
                     try {
                         this.validateContributor(contributor);
                     }
@@ -1059,39 +973,25 @@ export class JATSExporter {
                     }
                     const contrib = this.document.createElement('contrib');
                     contrib.setAttribute('contrib-type', 'author');
-                    contrib.setAttribute('id', normalizeID(contributor._id));
-                    if (contributor.isCorresponding) {
+                    contrib.setAttribute('id', normalizeID(contributor.attrs.id));
+                    if (contributor.attrs.isCorresponding) {
                         contrib.setAttribute('corresp', 'yes');
                     }
-                    if (contributor.ORCIDIdentifier) {
+                    if (contributor.attrs.ORCIDIdentifier) {
                         const identifier = this.document.createElement('contrib-id');
                         identifier.setAttribute('contrib-id-type', 'orcid');
-                        identifier.textContent = contributor.ORCIDIdentifier;
+                        identifier.textContent = contributor.attrs.ORCIDIdentifier;
                         contrib.appendChild(identifier);
                     }
                     const name = this.buildContributorName(contributor);
                     contrib.appendChild(name);
-                    if (contributor.email) {
+                    if (contributor.attrs.email) {
                         const email = this.document.createElement('email');
-                        email.textContent = contributor.email;
+                        email.textContent = contributor.attrs.email;
                         contrib.appendChild(email);
                     }
-                    if (contributor.roles) {
-                        contributor.roles.forEach((rid) => {
-                            const contributorRole = this.modelMap.get(rid);
-                            if (contributorRole) {
-                                const role = this.document.createElement('role');
-                                const attributes = chooseRoleVocabAttributes(contributorRole);
-                                for (const [key, value] of Object.entries(attributes)) {
-                                    role.setAttribute(key, value);
-                                }
-                                role.textContent = contributorRole.name;
-                                contrib.appendChild(role);
-                            }
-                        });
-                    }
-                    if (contributor.affiliations) {
-                        contributor.affiliations.forEach((rid) => {
+                    if (contributor.attrs.affiliations) {
+                        contributor.attrs.affiliations.forEach((rid) => {
                             const xref = this.document.createElement('xref');
                             xref.setAttribute('ref-type', 'aff');
                             xref.setAttribute('rid', normalizeID(rid));
@@ -1099,8 +999,8 @@ export class JATSExporter {
                             contrib.appendChild(xref);
                         });
                     }
-                    if (contributor.footnote) {
-                        contributor.footnote.map((note) => {
+                    if (contributor.attrs.footnote) {
+                        contributor.attrs.footnote.map((note) => {
                             const xref = this.document.createElement('xref');
                             xref.setAttribute('ref-type', 'fn');
                             xref.setAttribute('rid', normalizeID(note.noteID));
@@ -1108,8 +1008,8 @@ export class JATSExporter {
                             contrib.appendChild(xref);
                         });
                     }
-                    if (contributor.corresp) {
-                        contributor.corresp.map((corresp) => {
+                    if (contributor.attrs.corresp) {
+                        contributor.attrs.corresp.map((corresp) => {
                             const xref = this.document.createElement('xref');
                             xref.setAttribute('ref-type', 'corresp');
                             xref.setAttribute('rid', normalizeID(corresp.correspID));
@@ -1119,13 +1019,10 @@ export class JATSExporter {
                     }
                     contribGroup.appendChild(contrib);
                 });
-                const otherContributors = contributors
-                    .filter((contributor) => contributor.role !== 'author')
-                    .sort(sortContributors);
-                if (otherContributors.length) {
+                if (otherContributorsNodes.length) {
                     const contribGroup = this.document.createElement('contrib-group');
                     articleMeta.appendChild(contribGroup);
-                    otherContributors.forEach((contributor) => {
+                    otherContributorsNodes.forEach((contributor) => {
                         try {
                             this.validateContributor(contributor);
                         }
@@ -1134,30 +1031,16 @@ export class JATSExporter {
                             return;
                         }
                         const contrib = this.document.createElement('contrib');
-                        contrib.setAttribute('id', normalizeID(contributor._id));
+                        contrib.setAttribute('id', normalizeID(contributor.attrs.id));
                         const name = this.buildContributorName(contributor);
                         contrib.appendChild(name);
-                        if (contributor.email) {
+                        if (contributor.attrs.email) {
                             const email = this.document.createElement('email');
-                            email.textContent = contributor.email;
+                            email.textContent = contributor.attrs.email;
                             contrib.appendChild(email);
                         }
-                        if (contributor.roles) {
-                            contributor.roles.forEach((rid) => {
-                                const contributorRole = this.modelMap.get(rid);
-                                if (contributorRole) {
-                                    const role = this.document.createElement('role');
-                                    const attributes = chooseRoleVocabAttributes(contributorRole);
-                                    for (const [key, value] of Object.entries(attributes)) {
-                                        role.setAttribute(key, value);
-                                    }
-                                    role.textContent = contributorRole.name;
-                                    contrib.appendChild(role);
-                                }
-                            });
-                        }
-                        if (contributor.affiliations) {
-                            contributor.affiliations.forEach((rid) => {
+                        if (contributor.attrs.affiliations) {
+                            contributor.attrs.affiliations.forEach((rid) => {
                                 const xref = this.document.createElement('xref');
                                 xref.setAttribute('ref-type', 'aff');
                                 xref.setAttribute('rid', normalizeID(rid));
@@ -1165,8 +1048,8 @@ export class JATSExporter {
                                 contrib.appendChild(xref);
                             });
                         }
-                        if (contributor.footnote) {
-                            contributor.footnote.map((note) => {
+                        if (contributor.attrs.footnote) {
+                            contributor.attrs.footnote.map((note) => {
                                 const xref = this.document.createElement('xref');
                                 xref.setAttribute('ref-type', 'fn');
                                 xref.setAttribute('rid', normalizeID(note.noteID));
@@ -1178,64 +1061,68 @@ export class JATSExporter {
                     });
                 }
                 const affiliationRIDs = [];
-                const sortedContributors = [...authorContributors, ...otherContributors];
+                const sortedContributors = [
+                    ...authorContributorNodes,
+                    ...otherContributorsNodes,
+                ];
                 for (const contributor of sortedContributors) {
-                    if (contributor.affiliations) {
-                        affiliationRIDs.push(...contributor.affiliations);
+                    if (contributor.attrs.affiliations) {
+                        affiliationRIDs.push(...contributor.attrs.affiliations);
                     }
                 }
-                const affiliations = this.models.filter(hasObjectType(ObjectTypes.Affiliation));
+                const affiliations = findChildrenByType(this.manuscriptNode, schema.nodes.affiliation).map((result) => result.node);
                 if (affiliations) {
-                    const usedAffiliations = affiliations.filter((affiliation) => affiliationRIDs.includes(affiliation._id));
-                    usedAffiliations.sort((a, b) => affiliationRIDs.indexOf(a._id) - affiliationRIDs.indexOf(b._id));
+                    const usedAffiliations = affiliations.filter((affiliation) => affiliationRIDs.includes(affiliation.attrs.id));
+                    usedAffiliations.sort((a, b) => affiliationRIDs.indexOf(a.attrs.id) -
+                        affiliationRIDs.indexOf(b.attrs.id));
                     usedAffiliations.forEach((affiliation) => {
                         var _a, _b;
                         const aff = this.document.createElement('aff');
-                        aff.setAttribute('id', normalizeID(affiliation._id));
+                        aff.setAttribute('id', normalizeID(affiliation.attrs.id));
                         contribGroup.appendChild(aff);
-                        if (affiliation.department) {
+                        if (affiliation.attrs.department) {
                             const department = this.document.createElement('institution');
                             department.setAttribute('content-type', 'dept');
-                            department.textContent = affiliation.department;
+                            department.textContent = affiliation.attrs.department;
                             aff.appendChild(department);
                         }
-                        if (affiliation.institution) {
+                        if (affiliation.attrs.institution) {
                             const institution = this.document.createElement('institution');
-                            institution.textContent = affiliation.institution;
+                            institution.textContent = affiliation.attrs.institution;
                             aff.appendChild(institution);
                         }
-                        if (affiliation.addressLine1) {
+                        if (affiliation.attrs.addressLine1) {
                             const addressLine = this.document.createElement('addr-line');
-                            addressLine.textContent = affiliation.addressLine1;
+                            addressLine.textContent = affiliation.attrs.addressLine1;
                             aff.appendChild(addressLine);
                         }
-                        if (affiliation.addressLine2) {
+                        if (affiliation.attrs.addressLine2) {
                             const addressLine = this.document.createElement('addr-line');
-                            addressLine.textContent = affiliation.addressLine2;
+                            addressLine.textContent = affiliation.attrs.addressLine2;
                             aff.appendChild(addressLine);
                         }
-                        if (affiliation.addressLine3) {
+                        if (affiliation.attrs.addressLine3) {
                             const addressLine = this.document.createElement('addr-line');
-                            addressLine.textContent = affiliation.addressLine3;
+                            addressLine.textContent = affiliation.attrs.addressLine3;
                             aff.appendChild(addressLine);
                         }
-                        if (affiliation.city) {
+                        if (affiliation.attrs.city) {
                             const city = this.document.createElement('city');
-                            city.textContent = affiliation.city;
+                            city.textContent = affiliation.attrs.city;
                             aff.appendChild(city);
                         }
-                        if (affiliation.country) {
+                        if (affiliation.attrs.country) {
                             const country = this.document.createElement('country');
-                            country.textContent = affiliation.country;
+                            country.textContent = affiliation.attrs.country;
                             aff.appendChild(country);
                         }
-                        if (affiliation.email) {
+                        if (affiliation.attrs.email) {
                             const email = this.document.createElement('email');
-                            email.setAttributeNS(XLINK_NAMESPACE, 'href', (_a = affiliation.email.href) !== null && _a !== void 0 ? _a : '');
-                            email.textContent = (_b = affiliation.email.text) !== null && _b !== void 0 ? _b : '';
+                            email.setAttributeNS(XLINK_NAMESPACE, 'href', (_a = affiliation.attrs.email.href) !== null && _a !== void 0 ? _a : '');
+                            email.textContent = (_b = affiliation.attrs.email.text) !== null && _b !== void 0 ? _b : '';
                             aff.appendChild(email);
                         }
-                        const labelNumber = affiliationLabels.get(affiliation._id);
+                        const labelNumber = affiliationLabels.get(affiliation.attrs.id);
                         if (labelNumber) {
                             const label = this.document.createElement('label');
                             label.textContent = String(labelNumber);
@@ -1252,41 +1139,48 @@ export class JATSExporter {
         this.createAuthorNotesElement = () => {
             var _a;
             const authorNotesEl = this.document.createElement('author-notes');
-            const authorNotes = (_a = getModelsByType(this.modelMap, ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
-            if (authorNotes) {
-                this.appendModelsToAuthorNotes(authorNotesEl, authorNotes.containedObjectIDs);
+            const authorNotesNode = (_a = findChildrenByType(this.manuscriptNode, schema.nodes.author_notes)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            if (authorNotesNode) {
+                this.appendModelsToAuthorNotes(authorNotesEl, authorNotesNode);
             }
             return authorNotesEl;
         };
         this.appendCorrespondingToElement = (corresponding, element) => {
             const correspondingEl = this.document.createElement('corresp');
-            correspondingEl.setAttribute('id', normalizeID(corresponding._id));
-            if (corresponding.label) {
+            correspondingEl.setAttribute('id', normalizeID(corresponding.attrs.id));
+            if (corresponding.attrs.label) {
                 const labelEl = this.document.createElement('label');
-                labelEl.textContent = corresponding.label;
+                labelEl.textContent = corresponding.attrs.label;
                 correspondingEl.appendChild(labelEl);
             }
-            correspondingEl.append(corresponding.contents);
+            correspondingEl.append(corresponding.textContent);
             element.appendChild(correspondingEl);
         };
         this.appendParagraphToElement = (paragraph, element) => {
-            const parsedDoc = new DOMParser().parseFromString(paragraph.contents, 'text/html');
+            const parsedDoc = new DOMParser().parseFromString(paragraph.textContent, 'text/html');
             const parsedParagraph = parsedDoc.body.querySelector('p');
             if (parsedParagraph) {
                 const paragraphEl = this.document.createElement('p');
                 paragraphEl.innerHTML = parsedParagraph.innerHTML;
-                paragraphEl.setAttribute('id', normalizeID(paragraph._id));
+                paragraphEl.setAttribute('id', normalizeID(paragraph.attrs.id));
                 element.appendChild(paragraphEl);
             }
         };
         this.appendFootnoteToElement = (footnote, element) => {
             const footnoteEl = this.document.createElement('fn');
-            footnoteEl.setAttribute('id', normalizeID(footnote._id));
-            footnoteEl.innerHTML = footnote.contents;
+            footnoteEl.setAttribute('id', normalizeID(footnote.attrs.id));
+            if (!footnote.textContent.includes('<p>')) {
+                const p = this.document.createElement('p');
+                p.innerHTML = footnote.textContent;
+                footnoteEl.appendChild(p);
+            }
+            else {
+                footnoteEl.innerHTML = footnote.textContent;
+            }
             element.appendChild(footnoteEl);
         };
-        this.fixBody = (body, fragment) => {
-            fragment.descendants((node) => {
+        this.fixBody = (body) => {
+            this.manuscriptNode.descendants((node) => {
                 if (node.attrs.id) {
                     if (node.attrs.titleSuppressed) {
                         const title = body.querySelector(`#${normalizeID(node.attrs.id)} > title`);
@@ -1414,6 +1308,23 @@ export class JATSExporter {
             }
             body.removeChild(container);
         };
+        this.moveAwards = (front, body) => {
+            const awardGroups = body.querySelectorAll(':scope > award-group');
+            if (!awardGroups.length) {
+                return;
+            }
+            const fundingGroup = this.document.createElement('funding-group');
+            awardGroups.forEach((award) => {
+                fundingGroup.appendChild(award);
+            });
+            const articleMeta = front.querySelector(':scope > article-meta');
+            if (articleMeta) {
+                const insertBeforeElement = articleMeta.querySelector(':scope > support-group, :scope > conference, :scope > counts, :scope > custom-meta-group');
+                insertBeforeElement
+                    ? articleMeta.insertBefore(fundingGroup, insertBeforeElement)
+                    : articleMeta.appendChild(fundingGroup);
+            }
+        };
         this.moveAbstracts = (front, body) => {
             const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
             let abstractSections;
@@ -1547,36 +1458,36 @@ export class JATSExporter {
         };
         this.buildContributorName = (contributor) => {
             const name = this.document.createElement('name');
-            if (contributor.bibliographicName.family) {
+            if (contributor.attrs.bibliographicName.family) {
                 const surname = this.document.createElement('surname');
-                surname.textContent = contributor.bibliographicName.family;
+                surname.textContent = contributor.attrs.bibliographicName.family;
                 name.appendChild(surname);
             }
-            if (contributor.bibliographicName.given) {
+            if (contributor.attrs.bibliographicName.given) {
                 const givenNames = this.document.createElement('given-names');
-                givenNames.textContent = contributor.bibliographicName.given;
+                givenNames.textContent = contributor.attrs.bibliographicName.given;
                 name.appendChild(givenNames);
             }
             return name;
         };
     }
-    generateCitations(fragment) {
+    generateCitations() {
         const nodes = [];
-        fragment.descendants((node) => {
+        this.manuscriptNode.descendants((node) => {
             if (isCitationNode(node)) {
                 nodes.push(node);
             }
         });
         return buildCitations(nodes);
     }
-    generateCitationTexts(fragment, csl) {
+    generateCitationTexts(csl, manuscriptID) {
         this.citationTexts = new Map();
         this.citationProvider = new CitationProvider({
-            getLibraryItem: (id) => this.modelMap.get(id),
+            getLibraryItem: this.getLibraryItem(manuscriptID),
             locale: csl.locale,
             citationStyle: csl.style,
         });
-        const citations = this.generateCitations(fragment);
+        const citations = this.generateCitations();
         this.citationProvider.rebuildState(citations).forEach(([id, , output]) => {
             this.citationTexts.set(id, output);
         });
@@ -1603,72 +1514,50 @@ export class JATSExporter {
             return mathml;
         }
     }
-    appendModelsToAuthorNotes(authorNotesEl, containedObjectIDs) {
-        const contributors = this.models.filter(isContributor);
-        const usedCorrespondings = this.getUsedCorrespondings(contributors);
-        containedObjectIDs.forEach((id) => {
-            const model = this.modelMap.get(id);
-            if (!model) {
-                return;
-            }
-            switch (model.objectType) {
-                case ObjectTypes.ParagraphElement:
-                    this.appendParagraphToElement(model, authorNotesEl);
+    appendModelsToAuthorNotes(authorNotesEl, authorNotesNode) {
+        const contributorsNodes = findChildrenByType(this.manuscriptNode, schema.nodes.contributor).map((result) => result.node);
+        const usedCorrespondings = this.getUsedCorrespondings(contributorsNodes);
+        authorNotesNode.descendants((node) => {
+            switch (node.type) {
+                case schema.nodes.paragraph:
+                    this.appendParagraphToElement(node, authorNotesEl);
                     break;
-                case ObjectTypes.Footnote:
-                    this.appendFootnoteToElement(model, authorNotesEl);
+                case schema.nodes.footnote:
+                    this.appendFootnoteToElement(node, authorNotesEl);
                     break;
-                case ObjectTypes.Corresponding:
-                    if (usedCorrespondings.includes(model)) {
-                        this.appendCorrespondingToElement(model, authorNotesEl);
+                case schema.nodes.corresp:
+                    if (usedCorrespondings.includes(node)) {
+                        this.appendCorrespondingToElement(node, authorNotesEl);
                     }
                     break;
             }
+            return false;
         });
     }
     getUsedCorrespondings(contributors) {
         return contributors
-            .flatMap((c) => { var _a; return (_a = c.corresp) !== null && _a !== void 0 ? _a : []; })
-            .map((corresp) => this.modelMap.get(corresp.correspID))
+            .flatMap((c) => { var _a; return (_a = c.attrs.corresp) !== null && _a !== void 0 ? _a : []; })
+            .map((corresp) => {
+            var _a;
+            return (_a = findChildrenByAttr(this.manuscriptNode, (attr) => attr.id === corresp.correspID)[0]) === null || _a === void 0 ? void 0 : _a.node;
+        })
             .filter((corresp) => !!corresp);
     }
     buildKeywords(articleMeta) {
-        const keywords = [...this.modelMap.values()].filter((model) => model.objectType === ObjectTypes.Keyword);
-        const keywordGroups = new Map();
-        keywords.forEach((keyword) => {
-            const containedGroup = keyword.containedGroup || '';
-            const group = keywordGroups.get(containedGroup);
-            if (group) {
-                group.push(keyword);
-            }
-            else {
-                keywordGroups.set(containedGroup, [keyword]);
-            }
-        });
-        for (const [groupID, keywords] of keywordGroups) {
-            const keywordGroup = (this.modelMap.get(groupID) || {});
+        const keywordGroups = findChildrenByType(this.manuscriptNode, schema.nodes.keyword_group).map((result) => result.node);
+        keywordGroups.forEach((group) => {
             const kwdGroup = this.document.createElement('kwd-group');
-            if (keywordGroup.type) {
-                kwdGroup.setAttribute('kwd-group-type', keywordGroup.type);
-            }
-            if (keywordGroup.label) {
-                const label = this.document.createElement('label');
-                label.textContent = keywordGroup.label;
-                kwdGroup.appendChild(label);
-            }
-            if (keywordGroup.title) {
-                const title = this.document.createElement('title');
-                title.textContent = keywordGroup.title;
-                kwdGroup.appendChild(title);
+            if (group.attrs.type) {
+                kwdGroup.setAttribute('kwd-group-type', group.attrs.type);
             }
             articleMeta.appendChild(kwdGroup);
-            for (const keyword of keywords) {
+            group.content.forEach((keyword) => {
                 const kwd = this.document.createElement('kwd');
-                kwd.textContent = keyword.name;
+                kwd.textContent = keyword.textContent;
                 kwdGroup.appendChild(kwd);
-            }
+            });
             articleMeta.appendChild(kwdGroup);
-        }
+        });
     }
     moveCoiStatementToAuthorNotes(back, front) {
         const fnGroups = back.querySelectorAll('fn-group');