@manuscripts/transform 3.0.50 → 3.0.52

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

@@ -127,9 +127,20 @@ class JATSExporter {
                 };
             };
         };
+        this.nodesMap = new Map();
+        this.populateNodesMap = () => {
+            this.manuscriptNode.descendants((node) => {
+                var _a;
+                const type = node.type;
+                const nodes = (_a = this.nodesMap.get(type)) !== null && _a !== void 0 ? _a : [];
+                nodes.push(node);
+                this.nodesMap.set(type, nodes);
+            });
+        };
         this.serializeToJATS = async (manuscriptNode, options) => {
             var _a;
             this.manuscriptNode = manuscriptNode;
+            this.populateNodesMap();
             this.generateCitationTexts(options.csl, manuscriptNode.attrs.id);
             this.createSerializer();
             const versionIds = (0, jats_versions_1.selectVersionIds)((_a = options.version) !== null && _a !== void 0 ? _a : '1.2');
@@ -269,13 +280,13 @@ class JATSExporter {
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
-            const titleNode = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.title).map((r) => r.node)[0];
+            const titleNode = this.getFirstChildOfType(schema_1.schema.nodes.title);
             if (titleNode) {
                 const element = this.document.createElement('article-title');
                 this.setTitleContent(element, titleNode.textContent);
                 titleGroup.appendChild(element);
             }
-            const altTitlesNodes = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.alt_title).map((r) => r.node);
+            const altTitlesNodes = this.getChildrenOfType(schema_1.schema.nodes.alt_title);
             altTitlesNodes.forEach((titleNode) => {
                 const element = this.document.createElement('alt-title');
                 element.setAttribute('alt-title-type', titleNode.attrs.type);
@@ -284,8 +295,8 @@ class JATSExporter {
             });
             articleMeta.appendChild(titleGroup);
             this.buildContributors(articleMeta);
-            const supplementsNodes = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.supplement);
-            supplementsNodes.forEach(({ node }) => {
+            const supplementsNodes = this.getChildrenOfType(schema_1.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));
@@ -330,13 +341,13 @@ class JATSExporter {
             }
             this.buildKeywords(articleMeta);
             let countingElements = [];
-            const figureCount = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.figure).length;
+            const figureCount = this.getChildrenOfType(schema_1.schema.nodes.figure).length;
             countingElements.push(this.buildCountingElement('fig-count', figureCount));
-            const tableCount = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.table).length;
+            const tableCount = this.getChildrenOfType(schema_1.schema.nodes.table).length;
             countingElements.push(this.buildCountingElement('table-count', tableCount));
-            const equationCount = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.equation_element).length;
+            const equationCount = this.getChildrenOfType(schema_1.schema.nodes.equation_element).length;
             countingElements.push(this.buildCountingElement('equation-count', equationCount));
-            const referencesCount = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.bibliography_item).length;
+            const referencesCount = this.getChildrenOfType(schema_1.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));
@@ -349,7 +360,7 @@ class JATSExporter {
             if (!journalMeta.hasChildNodes()) {
                 journalMeta.remove();
             }
-            const selfUriAttachments = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.attachment).map((r) => r.node);
+            const selfUriAttachments = this.getChildrenOfType(schema_1.schema.nodes.attachment);
             selfUriAttachments.forEach((attachment) => {
                 const selfUriElement = this.document.createElement('self-uri');
                 selfUriElement.setAttribute('content-type', attachment.attrs.type);
@@ -416,7 +427,7 @@ class JATSExporter {
                 refList = this.document.createElement('ref-list');
             }
             back.appendChild(refList);
-            const bibliographyItems = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.bibliography_item).map((n) => n.node);
+            const bibliographyItems = this.getChildrenOfType(schema_1.schema.nodes.bibliography_item);
             const [meta] = this.citationProvider.makeBibliography();
             for (const [id] of meta.entry_ids) {
                 const bibliographyItem = bibliographyItems.find((n) => n.attrs.id === id);
@@ -805,11 +816,14 @@ class JATSExporter {
                 placeholder_element: () => {
                     return this.document.createElement('boxed-text');
                 },
-                pullquote_element: () => [
-                    'disp-quote',
-                    { 'content-type': 'pullquote' },
-                    0,
-                ],
+                pullquote_element: (node) => {
+                    var _a;
+                    let type = 'pullquote';
+                    if (((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.type) === schema_1.schema.nodes.figure) {
+                        type = 'quote-with-image';
+                    }
+                    return ['disp-quote', { 'content-type': type }, 0];
+                },
                 graphical_abstract_section: (node) => {
                     const attrs = {
                         id: normalizeID(node.attrs.id),
@@ -913,16 +927,14 @@ class JATSExporter {
                 }
             };
             const appendChildNodeOfType = (element, node, type) => {
-                var _a;
-                const childNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(node, type)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                const childNode = this.getFirstChildOfType(type, node);
                 if (childNode) {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
             const appendTable = (element, node) => {
-                var _a, _b;
-                const tableNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(node, node.type.schema.nodes.table)[0]) === null || _a === void 0 ? void 0 : _a.node;
-                const colGroupNode = (_b = (0, prosemirror_utils_1.findChildrenByType)(node, node.type.schema.nodes.table_colgroup)[0]) === null || _b === void 0 ? void 0 : _b.node;
+                const tableNode = this.getFirstChildOfType(schema_1.schema.nodes.table, node);
+                const colGroupNode = this.getFirstChildOfType(schema_1.schema.nodes.table_colgroup, node);
                 if (!tableNode) {
                     return;
                 }
@@ -947,6 +959,13 @@ class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
+            const isChildOfNodeType = (targetID, type, descend = false) => {
+                const nodes = this.getChildrenOfType(type);
+                return nodes.some((node) => {
+                    const result = (0, prosemirror_utils_1.findChildrenByAttr)(node, (attrs) => attrs.id === targetID, descend)[0];
+                    return !!result;
+                });
+            };
             const createImage = (node) => {
                 const graphicNode = node.content.firstChild;
                 if (graphicNode) {
@@ -957,18 +976,19 @@ class JATSExporter {
                 }
                 return '';
             };
-            const createGraphic = (node, isChildOfFigure = true) => {
+            const createGraphic = (node) => {
                 const graphic = this.document.createElement('graphic');
                 graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (!isChildOfFigure && node.attrs.type) {
+                if (!isChildOfNodeType(node.attrs.id, schema_1.schema.nodes.figure_element) &&
+                    node.attrs.type) {
                     graphic.setAttribute('content-type', node.attrs.type);
                 }
                 return graphic;
             };
             const createFigureElement = (node, contentNodeType) => {
                 const element = createElement(node, 'fig');
-                const figNode = (0, prosemirror_utils_1.findChildrenByType)(node, node.type.schema.nodes.figure)[0];
-                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.node.attrs.type;
+                const figNode = this.getFirstChildOfType(schema_1.schema.nodes.figure, node);
+                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }
@@ -999,8 +1019,7 @@ class JATSExporter {
                 return element;
             };
             const processExecutableNode = (node, element) => {
-                var _a;
-                const listingNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(node, node.type.schema.nodes.listing)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                const listingNode = this.getFirstChildOfType(schema_1.schema.nodes.listing, node);
                 if (listingNode) {
                     const { contents, languageKey } = listingNode.attrs;
                     if (contents && languageKey) {
@@ -1029,7 +1048,7 @@ class JATSExporter {
             }
         };
         this.buildContributors = (articleMeta) => {
-            const contributorNodes = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.contributor).map((result) => result.node);
+            const contributorNodes = this.getChildrenOfType(schema_1.schema.nodes.contributor);
             const authorContributorNodes = contributorNodes
                 .filter((n) => n.attrs.role === 'author')
                 .sort(sortContributors);
@@ -1163,8 +1182,8 @@ class JATSExporter {
                         affiliationRIDs.push(...contributor.attrs.affiliations);
                     }
                 }
-                const affiliations = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.affiliation).map((result) => result.node);
-                if (affiliations) {
+                const affiliations = this.getChildrenOfType(schema_1.schema.nodes.affiliation);
+                if (affiliations.length) {
                     const usedAffiliations = affiliations.filter((affiliation) => affiliationRIDs.includes(affiliation.attrs.id));
                     usedAffiliations.sort((a, b) => affiliationRIDs.indexOf(a.attrs.id) -
                         affiliationRIDs.indexOf(b.attrs.id));
@@ -1230,9 +1249,8 @@ class JATSExporter {
             }
         };
         this.createAuthorNotesElement = () => {
-            var _a;
             const authorNotesEl = this.document.createElement('author-notes');
-            const authorNotesNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.author_notes)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const authorNotesNode = this.getFirstChildOfType(schema_1.schema.nodes.author_notes);
             if (authorNotesNode) {
                 this.appendModelsToAuthorNotes(authorNotesEl, authorNotesNode);
             }
@@ -1394,9 +1412,8 @@ class JATSExporter {
             }
         };
         this.moveAbstracts = (front, body) => {
-            var _a;
             const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
-            const abstractsNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.abstracts)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const abstractsNode = this.getFirstChildOfType(schema_1.schema.nodes.abstracts);
             const abstractCategories = this.getAbstractCategories(abstractsNode);
             const abstractSections = this.getAbstractSections(container, body, abstractCategories);
             if (abstractSections.length) {
@@ -1531,6 +1548,15 @@ class JATSExporter {
             this.citationTexts.set(id, output);
         });
     }
+    getFirstChildOfType(type, node) {
+        return this.getChildrenOfType(type, node)[0];
+    }
+    getChildrenOfType(type, node) {
+        const nodes = node
+            ? (0, prosemirror_utils_1.findChildrenByType)(node, type).map(({ node }) => node)
+            : this.nodesMap.get(type);
+        return (nodes !== null && nodes !== void 0 ? nodes : []).filter((n) => (0, schema_1.isNodeOfType)(n, type));
+    }
     createEquation(node, isInline = false) {
         if (node.attrs.format === 'tex') {
             const texMath = this.document.createElement('tex-math');
@@ -1554,7 +1580,7 @@ class JATSExporter {
         }
     }
     appendModelsToAuthorNotes(authorNotesEl, authorNotesNode) {
-        const contributorsNodes = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.contributor).map((result) => result.node);
+        const contributorsNodes = this.getChildrenOfType(schema_1.schema.nodes.contributor);
         const usedCorrespondings = this.getUsedCorrespondings(contributorsNodes);
         authorNotesNode.descendants((node) => {
             switch (node.type) {
@@ -1583,7 +1609,7 @@ class JATSExporter {
             .filter((corresp) => !!corresp);
     }
     buildKeywords(articleMeta) {
-        const keywordGroups = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.keyword_group).map((result) => result.node);
+        const keywordGroups = this.getChildrenOfType(schema_1.schema.nodes.keyword_group);
         keywordGroups.forEach((group) => {
             const kwdGroup = this.document.createElement('kwd-group');
             if (group.attrs.type) {

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

@@ -553,7 +553,7 @@ class JATSDOMParser {
                 },
             },
             {
-                tag: 'disp-quote[content-type=pullquote]',
+                tag: 'disp-quote',
                 node: 'pullquote_element',
                 getAttrs: (node) => {
                     const element = node;

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPullquoteElement = exports.pullquoteElement = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 exports.pullquoteElement = {
-    content: 'paragraph+ attribution',
+    content: 'figure? paragraph+ attribution',
     attrs: {
         id: { default: '' },
         placeholder: { default: '' },

package/dist/cjs/schema/types.js

@@ -15,3 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNodeOfType = void 0;
+function isNodeOfType(node, type) {
+    return node.type === type;
+}
+exports.isNodeOfType = isNodeOfType;

package/dist/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "3.0.50";
+exports.VERSION = "3.0.52";

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

@@ -21,7 +21,7 @@ import { findChildrenByAttr, findChildrenByType } from 'prosemirror-utils';
 import serializeToXML from 'w3c-xmlserializer';
 import { generateFootnoteLabels } from '../../lib/footnotes';
 import { nodeFromHTML, textFromHTML } from '../../lib/html';
-import { isCitationNode, schema, } from '../../schema';
+import { isCitationNode, isNodeOfType, schema, } from '../../schema';
 import { isExecutableNodeType, isNodeType } from '../../transformer';
 import { selectVersionIds } from './jats-versions';
 import { buildTargets } from './labels';
@@ -119,9 +119,20 @@ export class JATSExporter {
                 };
             };
         };
+        this.nodesMap = new Map();
+        this.populateNodesMap = () => {
+            this.manuscriptNode.descendants((node) => {
+                var _a;
+                const type = node.type;
+                const nodes = (_a = this.nodesMap.get(type)) !== null && _a !== void 0 ? _a : [];
+                nodes.push(node);
+                this.nodesMap.set(type, nodes);
+            });
+        };
         this.serializeToJATS = async (manuscriptNode, options) => {
             var _a;
             this.manuscriptNode = manuscriptNode;
+            this.populateNodesMap();
             this.generateCitationTexts(options.csl, manuscriptNode.attrs.id);
             this.createSerializer();
             const versionIds = selectVersionIds((_a = options.version) !== null && _a !== void 0 ? _a : '1.2');
@@ -261,13 +272,13 @@ export class JATSExporter {
                 articleMeta.appendChild(articleID);
             }
             const titleGroup = this.document.createElement('title-group');
-            const titleNode = findChildrenByType(this.manuscriptNode, schema.nodes.title).map((r) => r.node)[0];
+            const titleNode = this.getFirstChildOfType(schema.nodes.title);
             if (titleNode) {
                 const element = this.document.createElement('article-title');
                 this.setTitleContent(element, titleNode.textContent);
                 titleGroup.appendChild(element);
             }
-            const altTitlesNodes = findChildrenByType(this.manuscriptNode, schema.nodes.alt_title).map((r) => r.node);
+            const altTitlesNodes = this.getChildrenOfType(schema.nodes.alt_title);
             altTitlesNodes.forEach((titleNode) => {
                 const element = this.document.createElement('alt-title');
                 element.setAttribute('alt-title-type', titleNode.attrs.type);
@@ -276,8 +287,8 @@ export class JATSExporter {
             });
             articleMeta.appendChild(titleGroup);
             this.buildContributors(articleMeta);
-            const supplementsNodes = findChildrenByType(this.manuscriptNode, schema.nodes.supplement);
-            supplementsNodes.forEach(({ node }) => {
+            const supplementsNodes = this.getChildrenOfType(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));
@@ -322,13 +333,13 @@ export class JATSExporter {
             }
             this.buildKeywords(articleMeta);
             let countingElements = [];
-            const figureCount = findChildrenByType(this.manuscriptNode, schema.nodes.figure).length;
+            const figureCount = this.getChildrenOfType(schema.nodes.figure).length;
             countingElements.push(this.buildCountingElement('fig-count', figureCount));
-            const tableCount = findChildrenByType(this.manuscriptNode, schema.nodes.table).length;
+            const tableCount = this.getChildrenOfType(schema.nodes.table).length;
             countingElements.push(this.buildCountingElement('table-count', tableCount));
-            const equationCount = findChildrenByType(this.manuscriptNode, schema.nodes.equation_element).length;
+            const equationCount = this.getChildrenOfType(schema.nodes.equation_element).length;
             countingElements.push(this.buildCountingElement('equation-count', equationCount));
-            const referencesCount = findChildrenByType(this.manuscriptNode, schema.nodes.bibliography_item).length;
+            const referencesCount = this.getChildrenOfType(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));
@@ -341,7 +352,7 @@ export class JATSExporter {
             if (!journalMeta.hasChildNodes()) {
                 journalMeta.remove();
             }
-            const selfUriAttachments = findChildrenByType(this.manuscriptNode, schema.nodes.attachment).map((r) => r.node);
+            const selfUriAttachments = this.getChildrenOfType(schema.nodes.attachment);
             selfUriAttachments.forEach((attachment) => {
                 const selfUriElement = this.document.createElement('self-uri');
                 selfUriElement.setAttribute('content-type', attachment.attrs.type);
@@ -408,7 +419,7 @@ 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 bibliographyItems = this.getChildrenOfType(schema.nodes.bibliography_item);
             const [meta] = this.citationProvider.makeBibliography();
             for (const [id] of meta.entry_ids) {
                 const bibliographyItem = bibliographyItems.find((n) => n.attrs.id === id);
@@ -797,11 +808,14 @@ export class JATSExporter {
                 placeholder_element: () => {
                     return this.document.createElement('boxed-text');
                 },
-                pullquote_element: () => [
-                    'disp-quote',
-                    { 'content-type': 'pullquote' },
-                    0,
-                ],
+                pullquote_element: (node) => {
+                    var _a;
+                    let type = 'pullquote';
+                    if (((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.type) === schema.nodes.figure) {
+                        type = 'quote-with-image';
+                    }
+                    return ['disp-quote', { 'content-type': type }, 0];
+                },
                 graphical_abstract_section: (node) => {
                     const attrs = {
                         id: normalizeID(node.attrs.id),
@@ -905,16 +919,14 @@ export class JATSExporter {
                 }
             };
             const appendChildNodeOfType = (element, node, type) => {
-                var _a;
-                const childNode = (_a = findChildrenByType(node, type)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                const childNode = this.getFirstChildOfType(type, node);
                 if (childNode) {
                     element.appendChild(this.serializeNode(childNode));
                 }
             };
             const appendTable = (element, node) => {
-                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;
+                const tableNode = this.getFirstChildOfType(schema.nodes.table, node);
+                const colGroupNode = this.getFirstChildOfType(schema.nodes.table_colgroup, node);
                 if (!tableNode) {
                     return;
                 }
@@ -939,6 +951,13 @@ export class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
+            const isChildOfNodeType = (targetID, type, descend = false) => {
+                const nodes = this.getChildrenOfType(type);
+                return nodes.some((node) => {
+                    const result = findChildrenByAttr(node, (attrs) => attrs.id === targetID, descend)[0];
+                    return !!result;
+                });
+            };
             const createImage = (node) => {
                 const graphicNode = node.content.firstChild;
                 if (graphicNode) {
@@ -949,18 +968,19 @@ export class JATSExporter {
                 }
                 return '';
             };
-            const createGraphic = (node, isChildOfFigure = true) => {
+            const createGraphic = (node) => {
                 const graphic = this.document.createElement('graphic');
                 graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (!isChildOfFigure && node.attrs.type) {
+                if (!isChildOfNodeType(node.attrs.id, schema.nodes.figure_element) &&
+                    node.attrs.type) {
                     graphic.setAttribute('content-type', node.attrs.type);
                 }
                 return graphic;
             };
             const createFigureElement = (node, contentNodeType) => {
                 const element = createElement(node, 'fig');
-                const figNode = findChildrenByType(node, node.type.schema.nodes.figure)[0];
-                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.node.attrs.type;
+                const figNode = this.getFirstChildOfType(schema.nodes.figure, node);
+                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }
@@ -991,8 +1011,7 @@ export class JATSExporter {
                 return element;
             };
             const processExecutableNode = (node, element) => {
-                var _a;
-                const listingNode = (_a = findChildrenByType(node, node.type.schema.nodes.listing)[0]) === null || _a === void 0 ? void 0 : _a.node;
+                const listingNode = this.getFirstChildOfType(schema.nodes.listing, node);
                 if (listingNode) {
                     const { contents, languageKey } = listingNode.attrs;
                     if (contents && languageKey) {
@@ -1021,7 +1040,7 @@ export class JATSExporter {
             }
         };
         this.buildContributors = (articleMeta) => {
-            const contributorNodes = findChildrenByType(this.manuscriptNode, schema.nodes.contributor).map((result) => result.node);
+            const contributorNodes = this.getChildrenOfType(schema.nodes.contributor);
             const authorContributorNodes = contributorNodes
                 .filter((n) => n.attrs.role === 'author')
                 .sort(sortContributors);
@@ -1155,8 +1174,8 @@ export class JATSExporter {
                         affiliationRIDs.push(...contributor.attrs.affiliations);
                     }
                 }
-                const affiliations = findChildrenByType(this.manuscriptNode, schema.nodes.affiliation).map((result) => result.node);
-                if (affiliations) {
+                const affiliations = this.getChildrenOfType(schema.nodes.affiliation);
+                if (affiliations.length) {
                     const usedAffiliations = affiliations.filter((affiliation) => affiliationRIDs.includes(affiliation.attrs.id));
                     usedAffiliations.sort((a, b) => affiliationRIDs.indexOf(a.attrs.id) -
                         affiliationRIDs.indexOf(b.attrs.id));
@@ -1222,9 +1241,8 @@ export class JATSExporter {
             }
         };
         this.createAuthorNotesElement = () => {
-            var _a;
             const authorNotesEl = this.document.createElement('author-notes');
-            const authorNotesNode = (_a = findChildrenByType(this.manuscriptNode, schema.nodes.author_notes)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const authorNotesNode = this.getFirstChildOfType(schema.nodes.author_notes);
             if (authorNotesNode) {
                 this.appendModelsToAuthorNotes(authorNotesEl, authorNotesNode);
             }
@@ -1386,9 +1404,8 @@ export class JATSExporter {
             }
         };
         this.moveAbstracts = (front, body) => {
-            var _a;
             const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
-            const abstractsNode = (_a = findChildrenByType(this.manuscriptNode, schema.nodes.abstracts)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const abstractsNode = this.getFirstChildOfType(schema.nodes.abstracts);
             const abstractCategories = this.getAbstractCategories(abstractsNode);
             const abstractSections = this.getAbstractSections(container, body, abstractCategories);
             if (abstractSections.length) {
@@ -1523,6 +1540,15 @@ export class JATSExporter {
             this.citationTexts.set(id, output);
         });
     }
+    getFirstChildOfType(type, node) {
+        return this.getChildrenOfType(type, node)[0];
+    }
+    getChildrenOfType(type, node) {
+        const nodes = node
+            ? findChildrenByType(node, type).map(({ node }) => node)
+            : this.nodesMap.get(type);
+        return (nodes !== null && nodes !== void 0 ? nodes : []).filter((n) => isNodeOfType(n, type));
+    }
     createEquation(node, isInline = false) {
         if (node.attrs.format === 'tex') {
             const texMath = this.document.createElement('tex-math');
@@ -1546,7 +1572,7 @@ export class JATSExporter {
         }
     }
     appendModelsToAuthorNotes(authorNotesEl, authorNotesNode) {
-        const contributorsNodes = findChildrenByType(this.manuscriptNode, schema.nodes.contributor).map((result) => result.node);
+        const contributorsNodes = this.getChildrenOfType(schema.nodes.contributor);
         const usedCorrespondings = this.getUsedCorrespondings(contributorsNodes);
         authorNotesNode.descendants((node) => {
             switch (node.type) {
@@ -1575,7 +1601,7 @@ export class JATSExporter {
             .filter((corresp) => !!corresp);
     }
     buildKeywords(articleMeta) {
-        const keywordGroups = findChildrenByType(this.manuscriptNode, schema.nodes.keyword_group).map((result) => result.node);
+        const keywordGroups = this.getChildrenOfType(schema.nodes.keyword_group);
         keywordGroups.forEach((group) => {
             const kwdGroup = this.document.createElement('kwd-group');
             if (group.attrs.type) {

package/dist/es/jats/importer/jats-dom-parser.js

@@ -550,7 +550,7 @@ export class JATSDOMParser {
                 },
             },
             {
-                tag: 'disp-quote[content-type=pullquote]',
+                tag: 'disp-quote',
                 node: 'pullquote_element',
                 getAttrs: (node) => {
                     const element = node;

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

@@ -15,7 +15,7 @@
  */
 import { ObjectTypes } from '@manuscripts/json-schema';
 export const pullquoteElement = {
-    content: 'paragraph+ attribution',
+    content: 'figure? paragraph+ attribution',
     attrs: {
         id: { default: '' },
         placeholder: { default: '' },

package/dist/es/schema/types.js

@@ -13,4 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export {};
+export function isNodeOfType(node, type) {
+    return node.type === type;
+}

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.50";
+export const VERSION = "3.0.52";

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

@@ -15,7 +15,7 @@
  */
 import { BibliographyItem, Journal } from '@manuscripts/json-schema';
 import { CitationProvider } from '@manuscripts/library';
-import { DOMSerializer } from 'prosemirror-model';
+import { type NodeType, DOMSerializer } from 'prosemirror-model';
 import { CitationNode, ManuscriptNode } from '../../schema';
 import { IDGenerator } from '../types';
 import { Version } from './jats-versions';
@@ -60,6 +60,10 @@ export declare class JATSExporter {
     }[];
     protected getLibraryItem: (manuscriptID: string) => (id: string) => BibliographyItem | undefined;
     protected generateCitationTexts(csl: CSLOptions, manuscriptID: string): void;
+    private nodesMap;
+    private populateNodesMap;
+    protected getFirstChildOfType<T extends ManuscriptNode>(type: NodeType, node?: ManuscriptNode): T | undefined;
+    protected getChildrenOfType<T extends ManuscriptNode>(type: NodeType, node?: ManuscriptNode): T[];
     serializeToJATS: (manuscriptNode: ManuscriptNode, options: ExportOptions) => Promise<string>;
     private nodeFromJATS;
     protected rewriteIDs: (generator?: IDGenerator) => Promise<void>;

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

@@ -63,3 +63,4 @@ export type MarkRule = ParseRule & {
 export type NodeRule = ParseRule & {
     node?: Nodes | null;
 };
+export declare function isNodeOfType<T extends ManuscriptNode>(node: ManuscriptNode, type: NodeType): node is T;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.50";
+export declare const VERSION = "3.0.52";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "3.0.50",
+  "version": "3.0.52",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",