@manuscripts/transform 1.4.6 → 1.5.0-LEAN-3014-B-0

package/dist/cjs/transformer/encode.js

@@ -434,6 +434,22 @@ const encoders = {
             .map((childNode) => childNode.attrs.id)
             .filter((id) => id),
     }),
+    affiliations_section: (node, parent, path, priority) => ({
+        category: (0, section_category_1.buildSectionCategory)(node),
+        priority: priority.value++,
+        path: path.concat([node.attrs.id]),
+        elementIDs: childElements(node)
+            .map((childNode) => childNode.attrs.id)
+            .filter((id) => id),
+    }),
+    contributors_section: (node, parent, path, priority) => ({
+        category: (0, section_category_1.buildSectionCategory)(node),
+        priority: priority.value++,
+        path: path.concat([node.attrs.id]),
+        elementIDs: childElements(node)
+            .map((childNode) => childNode.attrs.id)
+            .filter((id) => id),
+    }),
     missing_figure: (node) => ({
         position: node.attrs.position || undefined,
     }),
@@ -514,6 +530,7 @@ const encoders = {
         postCode: node.attrs.postCode,
         country: node.attrs.country,
         email: node.attrs.email,
+        priority: node.attrs.priority,
     }),
     contributor: (node) => ({
         role: node.attrs.role,
@@ -523,6 +540,9 @@ const encoders = {
         invitationID: node.attrs.invitationID,
         isCorresponding: node.attrs.isCorresponding,
         ORCIDIdentifier: node.attrs.ORCIDIdentifier,
+        footnote: node.attrs.footnote,
+        corresp: node.attrs.corresp,
+        priority: node.attrs.priority,
     }),
 };
 const modelData = (node, parent, path, priority) => {

package/dist/cjs/transformer/node-types.js

@@ -57,6 +57,8 @@ exports.nodeTypesMap = new Map([
     [schema_1.schema.nodes.affiliation, json_schema_1.ObjectTypes.Affiliation],
     [schema_1.schema.nodes.contributor, json_schema_1.ObjectTypes.Contributor],
     [schema_1.schema.nodes.table_element_footer, json_schema_1.ObjectTypes.TableElementFooter],
+    [schema_1.schema.nodes.contributors_section, json_schema_1.ObjectTypes.Section],
+    [schema_1.schema.nodes.affiliations_section, json_schema_1.ObjectTypes.Section],
 ]);
 const isExecutableNodeType = (type) => (0, schema_1.hasGroup)(type, schema_1.GROUP_EXECUTABLE);
 exports.isExecutableNodeType = isExecutableNodeType;

package/dist/cjs/transformer/section-category.js

@@ -46,6 +46,10 @@ const chooseSectionNodeType = (category) => {
             return schema_1.schema.nodes.footnotes_section;
         case 'MPSectionCategory:keywords':
             return schema_1.schema.nodes.keywords_section;
+        case 'MPSectionCategory:affiliations':
+            return schema_1.schema.nodes.affiliations_section;
+        case 'MPSectionCategory:contributors':
+            return schema_1.schema.nodes.contributors_section;
         case 'MPSectionCategory:toc':
             return schema_1.schema.nodes.toc_section;
         default:
@@ -92,6 +96,10 @@ const buildSectionCategory = (node) => {
             return 'MPSectionCategory:toc';
         case schema_1.schema.nodes.graphical_abstract_section:
             return 'MPSectionCategory:abstract-graphical';
+        case schema_1.schema.nodes.affiliations_section:
+            return 'MPSectionCategory:affiliations';
+        case schema_1.schema.nodes.contributors_section:
+            return 'MPSectionCategory:contributors';
         default:
             return node.attrs.category || undefined;
     }
@@ -185,6 +193,10 @@ const chooseSectionCategoryByType = (secType) => {
             return 'MPSectionCategory:backmatter';
         case 'abstracts':
             return 'MPSectionCategory:abstracts';
+        case 'affiliations':
+            return 'MPSectionCategory:affiliations';
+        case 'contributors':
+            return 'MPSectionCategory:contributors';
         default:
             return undefined;
     }

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

@@ -499,6 +499,132 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'sec[sec-type="affiliations"]',
+        node: 'affiliations_section',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                category: 'MPSectionCategory:affiliations',
+            };
+        },
+    },
+    {
+        tag: 'aff',
+        node: 'affiliation',
+        context: 'affiliations_section/',
+        getAttrs: (node) => {
+            const element = node;
+            const aff = {
+                id: element.getAttribute('id'),
+            };
+            const institution = element.getAttribute('institution');
+            if (institution) {
+                aff.institution = institution;
+            }
+            const email = element.getAttribute('email');
+            if (email) {
+                aff.bibliographicName = JSON.parse(email);
+            }
+            const department = element.getAttribute('department');
+            if (department) {
+                aff.department = department;
+            }
+            const addressLine1 = element.getAttribute('addressLine1');
+            if (addressLine1) {
+                aff.addressLine1 = addressLine1;
+            }
+            const addressLine2 = element.getAttribute('addressLine2');
+            if (addressLine2) {
+                aff.addressLine2 = addressLine2;
+            }
+            const addressLine3 = element.getAttribute('addressLine3');
+            if (addressLine3) {
+                aff.addressLine3 = addressLine3;
+            }
+            const postCode = element.getAttribute('postCode');
+            if (postCode) {
+                aff.postCode = postCode;
+            }
+            const country = element.getAttribute('country');
+            if (country) {
+                aff.country = country;
+            }
+            const priority = element.getAttribute('priority');
+            if (priority) {
+                aff.priority = parseInt(priority);
+            }
+            return aff;
+        },
+    },
+    {
+        tag: 'sec[sec-type="contributors"]',
+        node: 'contributors_section',
+        getAttrs: (node) => {
+            const element = node;
+            return {
+                id: element.getAttribute('id'),
+                category: 'MPSectionCategory:contributors',
+            };
+        },
+    },
+    {
+        tag: 'contrib',
+        node: 'contributor',
+        context: 'contributors_section/',
+        getAttrs: (node) => {
+            const element = node;
+            const contrib = {
+                id: element.getAttribute('id'),
+            };
+            const role = element.getAttribute('role');
+            if (role) {
+                contrib.role = role;
+            }
+            const affiliations = element.getAttribute('affiliations');
+            if (affiliations) {
+                contrib.affiliations = JSON.parse(affiliations);
+            }
+            const footnote = element.getAttribute('footnote');
+            if (footnote) {
+                contrib.footnote = JSON.parse(footnote);
+            }
+            const corresp = element.getAttribute('corresp');
+            if (corresp) {
+                contrib.corresp = JSON.parse(corresp);
+            }
+            const bibliographicName = element.getAttribute('bibliographicName');
+            if (bibliographicName) {
+                contrib.bibliographicName = JSON.parse(bibliographicName);
+            }
+            const userID = element.getAttribute('userID');
+            if (userID) {
+                contrib.userID = userID;
+            }
+            const priority = element.getAttribute('priority');
+            if (priority) {
+                contrib.priority = parseInt(priority);
+            }
+            const invitationID = element.getAttribute('invitationID');
+            if (invitationID) {
+                contrib.invitationID = invitationID;
+            }
+            const objectType = element.getAttribute('objectType');
+            if (objectType) {
+                contrib.objectType = objectType;
+            }
+            const isCorresponding = element.getAttribute('isCorresponding');
+            if (isCorresponding) {
+                contrib.isCorresponding = JSON.parse(isCorresponding);
+            }
+            const ORCIDIdentifier = element.getAttribute('ORCIDIdentifier');
+            if (ORCIDIdentifier) {
+                contrib.ORCIDIdentifier = ORCIDIdentifier;
+            }
+            return contrib;
+        },
+    },
     {
         tag: 'sec[sec-type="keywords"]',
         node: 'keywords_section',

package/dist/es/jats/importer/jats-body-transformations.js

@@ -281,6 +281,65 @@ export const jatsBodyTransformations = {
             }
         }
     },
+    moveAffiliationsToBody(doc, affiliations, body, createElement) {
+        if (affiliations === null || affiliations === void 0 ? void 0 : affiliations.length) {
+            const section = createElement('sec');
+            section.setAttribute('sec-type', 'affiliations');
+            affiliations.forEach((affiliation) => {
+                const item = doc.createElement('aff');
+                item.setAttribute('id', affiliation._id);
+                affiliation.institution &&
+                    item.setAttribute('institution', affiliation.institution);
+                affiliation.email &&
+                    item.setAttribute('email', JSON.stringify(affiliation.email));
+                affiliation.department &&
+                    item.setAttribute('department', affiliation.department);
+                affiliation.addressLine1 &&
+                    item.setAttribute('addressLine1', affiliation.addressLine1);
+                affiliation.addressLine2 &&
+                    item.setAttribute('addressLine2', affiliation.addressLine2);
+                affiliation.addressLine3 &&
+                    item.setAttribute('addressLine3', affiliation.addressLine3);
+                affiliation.postCode &&
+                    item.setAttribute('postCode', affiliation.postCode);
+                affiliation.country && item.setAttribute('country', affiliation.country);
+                (affiliation.priority === 0 || affiliation.priority) &&
+                    item.setAttribute('priority', affiliation.priority.toString());
+                section.appendChild(item);
+            });
+            body.prepend(section);
+        }
+    },
+    moveAuthorsToBody(doc, authors, body, createElement) {
+        if (authors === null || authors === void 0 ? void 0 : authors.length) {
+            const section = createElement('sec');
+            section.setAttribute('sec-type', 'contributors');
+            authors.forEach((author) => {
+                const item = doc.createElement('contrib');
+                item.setAttribute('id', author._id);
+                author.role && item.setAttribute('role', author.role);
+                author.affiliations &&
+                    item.setAttribute('affiliations', JSON.stringify(author.affiliations));
+                author.footnote &&
+                    item.setAttribute('footnote', JSON.stringify(author.footnote));
+                author.corresp &&
+                    item.setAttribute('corresp', JSON.stringify(author.corresp));
+                author.bibliographicName &&
+                    item.setAttribute('bibliographicName', JSON.stringify(author.bibliographicName));
+                author.userID && item.setAttribute('userID', author.userID);
+                author.invitationID &&
+                    item.setAttribute('invitationID', author.invitationID);
+                author.isCorresponding &&
+                    item.setAttribute('isCorresponding', JSON.stringify(author.isCorresponding));
+                author.ORCIDIdentifier &&
+                    item.setAttribute('ORCIDIdentifier', author.ORCIDIdentifier);
+                (author.priority === 0 || author.priority) &&
+                    item.setAttribute('priority', author.priority.toString());
+                section.appendChild(item);
+            });
+            body.prepend(section);
+        }
+    },
     moveFloatsGroupToBody(doc, body, createElement) {
         const floatsGroup = doc.querySelector('floats-group');
         if (floatsGroup) {

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

@@ -15,7 +15,7 @@
  */
 import debug from 'debug';
 import { getTrimmedTextContent } from '../../lib/utils';
-import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildSupplementaryMaterial, } from '../../transformer/builders';
+import { buildAffiliation, buildBibliographicName, buildContributor, buildCorresp, buildFootnote, buildSupplementaryMaterial, } from '../../transformer';
 import { parseJournalMeta } from './jats-journal-meta-parser';
 const warn = debug('manuscripts-transform');
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';

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

@@ -16,6 +16,7 @@
 import { ObjectTypes, } from '@manuscripts/json-schema';
 import { generateID, hasObjectType, nodeTypesMap } from '../../transformer';
 const isAuxiliaryObjectReference = hasObjectType(ObjectTypes.AuxiliaryObjectReference);
+const excludedObjectTypes = [ObjectTypes.Contributor, ObjectTypes.Affiliation];
 export function flatten(arrays) {
     return [].concat(...arrays);
 }
@@ -44,6 +45,9 @@ const addMissingID = (node, replacements, warnings) => {
         warnings.push(`Unknown object type for node type ${node.type.name}`);
         return;
     }
+    if (excludedObjectTypes.includes(objectType)) {
+        return;
+    }
     const previousID = node.attrs.id;
     const nextID = generateID(objectType);
     if (previousID) {

package/dist/es/jats/importer/parse-jats-article.js

@@ -71,13 +71,13 @@ export const parseJATSFront = async (front) => {
     return {
         models: generateModelIDs([
             manuscript,
-            ...affiliations,
-            ...authors,
             ...footnotes,
             ...correspondingList,
             journal,
             ...supplements,
         ]),
+        authors: [...authors],
+        affiliations: [...affiliations],
     };
 };
 export const parseJATSReferences = (back, body, createElement) => {
@@ -101,7 +101,7 @@ export const parseJATSReferences = (back, body, createElement) => {
         referenceIdsMap,
     };
 };
-export const parseJATSBody = (document, body, bibliographyItems, refModels, referenceIdsMap, footnotesOrder) => {
+export const parseJATSBody = (document, body, bibliographyItems, authors, affiliations, refModels, referenceIdsMap, footnotesOrder) => {
     const createElement = createElementFn(document);
     const orderedFootnotesIDs = createOrderedFootnotesIDs(document);
     jatsBodyTransformations.moveFloatsGroupToBody(document, body, createElement);
@@ -111,6 +111,8 @@ export const parseJATSBody = (document, body, bibliographyItems, refModels, refe
     jatsBodyTransformations.moveTableFooterToEnd(body);
     jatsBodyTransformations.moveBlockNodesFromParagraph(document, body, createElement);
     jatsBodyTransformations.moveKeywordsToBody(document, body, createElement);
+    jatsBodyTransformations.moveAffiliationsToBody(document, affiliations, body, createElement);
+    jatsBodyTransformations.moveAuthorsToBody(document, authors, body, createElement);
     const node = jatsBodyDOMParser.parse(body);
     if (!node.firstChild) {
         throw new Error('No content was parsed from the JATS article body');
@@ -162,14 +164,14 @@ export const parseJATSArticle = async (doc) => {
     }
     const authorQueriesMap = markProcessingInstructions(doc);
     const createElement = createElementFn(document);
-    const { models: frontModels } = await parseJATSFront(front);
+    const { models: frontModels, authors, affiliations, } = await parseJATSFront(front);
     const { references, crossReferences, referenceQueriesMap, referenceIdsMap } = parseJATSReferences(back, body, createElement);
     transformTables(doc.querySelectorAll('table-wrap > table'), createElement);
     const footnotesOrder = createEmptyFootnotesOrder();
     let elementsOrder = [];
     const bodyModels = [];
     if (body) {
-        const bodyDoc = parseJATSBody(doc, body, references, crossReferences, referenceIdsMap, footnotesOrder);
+        const bodyDoc = parseJATSBody(doc, body, references, authors, affiliations, crossReferences, referenceIdsMap, footnotesOrder);
         bodyModels.push(...encode(bodyDoc).values());
         elementsOrder = getElementsOrder(bodyDoc);
     }

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

@@ -591,10 +591,12 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                table_element_footer: () => ['table-wrap-foot', 0],
+                affiliation_list: () => '',
                 contributor_list: () => '',
+                affiliations_section: () => '',
+                contributors_section: () => '',
+                table_element_footer: () => ['table-wrap-foot', 0],
                 contributor: () => '',
-                affiliation_list: () => '',
                 affiliation: () => '',
                 meta_section: () => '',
                 attribution: () => ['attrib', 0],

package/dist/es/lib/core-section-categories.js

@@ -13,7 +13,7 @@ export const coreSectionCategories = [
         desc: 'Backmatter section for grouping',
         objectType: 'MPSectionCategory',
         titles: [],
-        priority: 170,
+        priority: 180,
     },
     {
         _id: 'MPSectionCategory:body',
@@ -21,6 +21,6 @@ export const coreSectionCategories = [
         desc: 'Body section for grouping',
         objectType: 'MPSectionCategory',
         titles: [],
-        priority: 190,
+        priority: 200,
     },
 ];

package/dist/es/schema/index.js

@@ -17,6 +17,7 @@ import { Schema } from 'prosemirror-model';
 import { bold, code, italic, smallcaps, strikethrough, styled, subscript, superscript, tracked_delete, tracked_insert, underline, } from './marks';
 import { affiliation } from './nodes/affiliation';
 import { affiliationList } from './nodes/affiliation_list';
+import { affiliationsSection } from './nodes/affiliations_section';
 import { attribution } from './nodes/attribution';
 import { bibliographyElement } from './nodes/bibliography_element';
 import { bibliographyItem } from './nodes/bibliography_item';
@@ -29,6 +30,7 @@ import { comment } from './nodes/comment';
 import { commentList } from './nodes/comment_list';
 import { contributor } from './nodes/contributor';
 import { contributorList } from './nodes/contributor_list';
+import { contributorsSection } from './nodes/contributors_section';
 import { crossReference } from './nodes/cross_reference';
 import { doc } from './nodes/doc';
 import { equation } from './nodes/equation';
@@ -120,11 +122,11 @@ export * from './nodes/text';
 export * from './nodes/toc_element';
 export * from './nodes/toc_section';
 export * from './nodes/affiliation';
-export * from './nodes/affiliation_list';
 export * from './nodes/meta_section';
-export * from './nodes/contributor_list';
 export * from './nodes/contributor';
 export * from './nodes/table_element_footer';
+export * from './nodes/affiliations_section';
+export * from './nodes/contributors_section';
 export const schema = new Schema({
     marks: {
         bold,
@@ -197,9 +199,11 @@ export const schema = new Schema({
         toc_section: tocSection,
         affiliation,
         meta_section: metaSection,
-        affiliation_list: affiliationList,
-        contributor_list: contributorList,
         contributor: contributor,
         table_element_footer: tableElementFooter,
+        affiliations_section: affiliationsSection,
+        contributors_section: contributorsSection,
+        affiliation_list: affiliationList,
+        contributor_list: contributorList,
     },
 });

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

@@ -8,6 +8,7 @@ export const affiliation = {
         addressLine3: { default: '' },
         postCode: { default: '' },
         country: { default: '' },
+        priority: { default: undefined },
         email: {
             default: {
                 href: undefined,
@@ -15,5 +16,7 @@ export const affiliation = {
             },
         },
     },
+    group: 'block element',
+    toDOM: () => ['span'],
 };
 export const isAffiliationNode = (node) => node.type === node.type.schema.nodes.affiliation;

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

@@ -0,0 +1,11 @@
+export const affiliationsSection = {
+    content: 'section_title? affiliation*',
+    attrs: {
+        id: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block sections',
+    selectable: false,
+    toDOM: () => ['section', 0],
+};
+export const isAffiliationsSectionNode = (node) => node.type === node.type.schema.nodes.affiliations_section;

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

@@ -3,10 +3,16 @@ export const contributor = {
         id: { default: '' },
         role: { default: '' },
         affiliations: { default: [] },
+        footnote: { default: undefined },
+        corresp: { default: undefined },
         bibliographicName: { default: {} },
         userID: { default: undefined },
         invitationID: { default: undefined },
         isCorresponding: { default: undefined },
         ORCIDIdentifier: { default: undefined },
+        priority: { default: undefined },
     },
+    group: 'block element',
+    toDOM: () => ['span'],
 };
+export const isContributorNode = (node) => node.type === node.type.schema.nodes.contributor;

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

@@ -0,0 +1,11 @@
+export const contributorsSection = {
+    content: 'section_title? contributor*',
+    attrs: {
+        id: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block sections',
+    selectable: false,
+    toDOM: () => ['section', 0],
+};
+export const isContributorsSectionNode = (node) => node.type === node.type.schema.nodes.contributors_section;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const metaSection = {
-    content: 'affiliation_list contributor_list comment_list',
+    content: 'comment_list',
     attrs: {
         id: { default: 'META_SECTION' },
     },

package/dist/es/transformer/decode.js

@@ -57,29 +57,16 @@ export const isManuscriptNode = (model) => model !== null;
 const isParagraphElement = hasObjectType(ObjectTypes.ParagraphElement);
 const isFootnote = hasObjectType(ObjectTypes.Footnote);
 const isKeyword = hasObjectType(ObjectTypes.Keyword);
+const isKeywordsSection = (model) => model.category === 'MPSectionCategory:keywords';
+const isAffiliationsSection = (model) => model.category === 'MPSectionCategory:affiliations';
+const isContributorsSection = (model) => model.category === 'MPSectionCategory:contributors';
 const hasParentSection = (id) => (section) => section.path &&
     section.path.length > 1 &&
     section.path[section.path.length - 2] === id;
 export class Decoder {
-    createAffiliationListNode() {
-        const affiliationNodes = getAffiliations(this.modelMap)
-            .map((affiliation) => this.decode(affiliation))
-            .filter(Boolean);
-        return schema.nodes.affiliation_list.createAndFill({}, affiliationNodes);
-    }
-    createContributorListNode() {
-        const contributorNodes = getContributors(this.modelMap)
-            .map((contributor) => this.decode(contributor))
-            .filter(Boolean);
-        return schema.nodes.contributor_list.createAndFill({}, contributorNodes);
-    }
     createMetaSectionNode() {
-        const affiliationListNode = this.createAffiliationListNode();
-        const contributorListNode = this.createContributorListNode();
         const commentListNode = this.createCommentListNode();
         return schema.nodes.meta_section.createAndFill({}, [
-            affiliationListNode,
-            contributorListNode,
             commentListNode,
         ]);
     }
@@ -88,12 +75,43 @@ export class Decoder {
             ...this.comments.values(),
         ]);
     }
+    handleMissingRootSectionNodes(rootSectionNodes) {
+        if (!rootSectionNodes.find((node) => node.type.name === 'affiliations_section')) {
+            this.createAffiliationSectionNode(rootSectionNodes);
+        }
+        if (!rootSectionNodes.find((node) => node.type.name === 'contributors_section')) {
+            this.createContributorSectionNode(rootSectionNodes);
+        }
+    }
+    createAffiliationSectionNode(rootSectionNodes) {
+        const affiliationNodes = getAffiliations(this.modelMap)
+            .map((affiliation) => this.decode(affiliation))
+            .filter(Boolean);
+        if (affiliationNodes.length) {
+            const node = schema.nodes.affiliations_section.createAndFill({
+                id: generateNodeID(schema.nodes.section),
+            }, affiliationNodes);
+            rootSectionNodes.unshift(node);
+        }
+    }
+    createContributorSectionNode(rootSectionNodes) {
+        const contributorNodes = getContributors(this.modelMap)
+            .map((contributor) => this.decode(contributor))
+            .filter(Boolean);
+        if (contributorNodes.length) {
+            const node = schema.nodes.contributors_section.createAndFill({
+                id: generateNodeID(schema.nodes.section),
+            }, contributorNodes);
+            rootSectionNodes.unshift(node);
+        }
+    }
     createRootSectionNodes() {
         let rootSections = getSections(this.modelMap).filter((section) => !section.path || section.path.length <= 1);
         rootSections = this.addGeneratedLabels(rootSections);
         const rootSectionNodes = rootSections
             .map(this.decode)
             .filter(isManuscriptNode);
+        this.handleMissingRootSectionNodes(rootSectionNodes);
         if (!rootSectionNodes.length) {
             rootSectionNodes.push(schema.nodes.section.createAndFill({
                 id: generateNodeID(schema.nodes.section),
@@ -426,13 +444,12 @@ export class Decoder {
             },
             [ObjectTypes.Section]: (data) => {
                 const model = data;
-                const isKeywordsSection = model.category === 'MPSectionCategory:keywords';
                 const elements = [];
                 if (model.elementIDs) {
                     for (const id of model.elementIDs) {
                         const element = this.getModel(id);
                         if (element) {
-                            if (isKeywordsSection && isParagraphElement(element)) {
+                            if (isKeywordsSection(model) && isParagraphElement(element)) {
                                 continue;
                             }
                             elements.push(element);
@@ -475,11 +492,17 @@ export class Decoder {
                 const sectionNodeType = chooseSectionNodeType(sectionCategory);
                 const commentNodes = this.createCommentsNode(model);
                 commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = (sectionLabelNode
-                    ? [sectionLabelNode, sectionTitleNode]
-                    : [sectionTitleNode])
-                    .concat(elementNodes)
-                    .concat(nestedSections);
+                let content;
+                if (isAffiliationsSection(model) || isContributorsSection(model)) {
+                    content = elementNodes.concat(nestedSections);
+                }
+                else {
+                    content = (sectionLabelNode
+                        ? [sectionLabelNode, sectionTitleNode]
+                        : [sectionTitleNode])
+                        .concat(elementNodes)
+                        .concat(nestedSections);
+                }
                 const sectionNode = sectionNodeType.createAndFill({
                     id: model._id,
                     category: sectionCategory,
@@ -568,6 +591,8 @@ export class Decoder {
                     postCode: model.postCode,
                     country: model.country,
                     email: model.email,
+                    department: model.department,
+                    priority: model.priority,
                 });
             },
             [ObjectTypes.Contributor]: (data) => {
@@ -581,6 +606,9 @@ export class Decoder {
                     invitationID: model.invitationID,
                     isCorresponding: model.isCorresponding,
                     ORCIDIdentifier: model.ORCIDIdentifier,
+                    footnote: model.footnote,
+                    corresp: model.corresp,
+                    priority: model.priority,
                 });
             },
         };